To: vim-dev@vim.org

Subject: Patch 7.2.167

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.2.167

Problem:    Splint doesn't work well for checking the code.

Solution:   Add splint arguments in the Makefile.  Exclude some code from

	    splint that it can't handle.  Tune splint arguments to give

	    reasonable errors.  Add a filter for removing false warnings from

	    splint output.  Many small changes to avoid warnings.  More to

	    follow...

Files:	    Filelist, src/Makefile, src/buffer.c, src/charset.c,

	    src/cleanlint.vim, src/digraph.c, src/edit.c, src/ex_cmds.c,

	    src/globals.h, src/ops.c, src/os_unix.c, src/os_unix.h,

	    src/proto/buffer.pro, src/proto/edit.pro, src/screen.c,

	    src/structs.h

*** ../vim-7.2.166/Filelist	2008-09-20 16:26:10.000000000 +0200

--- Filelist	2009-05-05 21:45:49.000000000 +0200

***************

*** 139,144 ****

--- 139,145 ----

  		src/INSTALL \

  		src/INSTALLx.txt \

  		src/Makefile \

+ 		src/cleanlint.vim \

  		src/auto/configure \

  		src/config.aap.in \

  		src/config.h.in \

***************

*** 683,691 ****

  		runtime/spell/??/main.aap \

  		runtime/spell/yi/README.txt \

  		runtime/spell/main.aap \

- 		runtime/spell/cleanadd.vim \

  		runtime/spell/*.vim \

- 		runtime/spell/fixdup \

  # generic language files, binary

  LANG_GEN_BIN = \

--- 684,690 ----

*** ../vim-7.2.166/src/Makefile	2009-04-29 18:44:45.000000000 +0200

--- src/Makefile	2009-05-06 00:23:15.000000000 +0200

***************

*** 551,557 ****

  # }}}

  # LINT - for running lint

! LINT_OPTIONS = -beprxzF

  # PROFILING - Uncomment the next two lines to do profiling with gcc and gprof.

  # Might not work with GUI or Perl.

--- 551,562 ----

  # }}}

  # LINT - for running lint

! #  For standard lint

! #LINT = lint

! #LINT_OPTIONS = -beprxzF

! #  For splint  (see cleanlint.vim for filtering the output)

! LINT = splint

! LINT_OPTIONS = +unixlib -weak -macrovarprefixexclude -showfunc -linelen 9999

  # PROFILING - Uncomment the next two lines to do profiling with gcc and gprof.

  # Might not work with GUI or Perl.

***************

*** 1259,1274 ****

  #     This is for cproto 3 patchlevel 8 or below

  #     __inline, __attribute__ and __extension__ are not recognized by cproto

  #     G_IMPLEMENT_INLINES is to avoid functions defined in glib/gutils.h.

! NO_ATTR = -D__inline= -D__inline__= -DG_IMPLEMENT_INLINES \

! 	  -D"__attribute__\\(x\\)=" -D"__asm__\\(x\\)=" \

! 	  -D__extension__= -D__restrict="" \

! 	  -D__gnuc_va_list=char -D__builtin_va_list=char

  #

! #     This is for cproto 3 patchlevel 9 or above (currently 4.6)

  #     __inline and __attribute__ are now recognized by cproto

  #     -D"foo()=" is not supported by all compilers so do not use it

! # NO_ATTR=

  #

  #     maybe the "/usr/bin/cc -E" has to be adjusted for some systems

  # This is for cproto 3.5 patchlevel 3:

--- 1264,1279 ----

  #     This is for cproto 3 patchlevel 8 or below

  #     __inline, __attribute__ and __extension__ are not recognized by cproto

  #     G_IMPLEMENT_INLINES is to avoid functions defined in glib/gutils.h.

! #NO_ATTR = -D__inline= -D__inline__= -DG_IMPLEMENT_INLINES \

! #	  -D"__attribute__\\(x\\)=" -D"__asm__\\(x\\)=" \

! #	  -D__extension__= -D__restrict="" \

! #	  -D__gnuc_va_list=char -D__builtin_va_list=char

  #

! #     This is for cproto 3 patchlevel 9 or above (currently 4.6, 4.7g)

  #     __inline and __attribute__ are now recognized by cproto

  #     -D"foo()=" is not supported by all compilers so do not use it

! NO_ATTR=

  #

  #     maybe the "/usr/bin/cc -E" has to be adjusted for some systems

  # This is for cproto 3.5 patchlevel 3:

***************

*** 1432,1437 ****

--- 1437,1443 ----

  	$(SNIFF_SRC) $(WORKSHOP_SRC) $(WSDEBUG_SRC) $(NETBEANS_SRC)

  #LINT_SRC = $(SRC)

  #LINT_SRC = $(ALL_SRC)

+ #LINT_SRC = $(BASIC_SRC)

  OBJ = \

  	objects/buffer.o \

***************

*** 2272,2283 ****

  # Run lint.  Clean up the *.ln files that are sometimes left behind.

  lint:

! 	lint $(LINT_OPTIONS) $(LINT_CFLAGS) $(LINT_EXTRA) $(LINT_SRC)

  	-rm -f *.ln

  # Check dosinst.c with lint.

  lintinstall:

! 	lint $(LINT_OPTIONS) -DWIN32 -DUNIX_LINT dosinst.c

  	-rm -f dosinst.ln

  ###########################################################################

--- 2279,2290 ----

  # Run lint.  Clean up the *.ln files that are sometimes left behind.

  lint:

! 	$(LINT) $(LINT_OPTIONS) $(LINT_CFLAGS) $(LINT_EXTRA) $(LINT_SRC)

  	-rm -f *.ln

  # Check dosinst.c with lint.

  lintinstall:

! 	$(LINT) $(LINT_OPTIONS) -DWIN32 -DUNIX_LINT dosinst.c

  	-rm -f dosinst.ln

  ###########################################################################

*** ../vim-7.2.166/src/buffer.c	2009-02-22 00:01:42.000000000 +0100

--- src/buffer.c	2009-05-13 12:25:29.000000000 +0200

***************

*** 44,49 ****

--- 44,50 ----

  #ifdef FEAT_TITLE

  static int	ti_change __ARGS((char_u *str, char_u **last));

  #endif

+ static int	append_arg_number __ARGS((win_T *wp, char_u *buf, int buflen, int add_file));

  static void	free_buffer __ARGS((buf_T *));

  static void	free_buffer_stuff __ARGS((buf_T *buf, int free_options));

  static void	clear_wininfo __ARGS((buf_T *buf));

***************

*** 1453,1465 ****

  #ifdef FEAT_KEYMAP

      if (curbuf->b_kmap_state & KEYMAP_INIT)

! 	keymap_init();

  #endif

  #ifdef FEAT_SPELL

      /* May need to set the spell language.  Can only do this after the buffer

       * has been properly setup. */

      if (!curbuf->b_help && curwin->w_p_spell && *curbuf->b_p_spl != NUL)

! 	did_set_spelllang(curbuf);

  #endif

      redraw_later(NOT_VALID);

--- 1454,1466 ----

  #ifdef FEAT_KEYMAP

      if (curbuf->b_kmap_state & KEYMAP_INIT)

! 	(void)keymap_init();

  #endif

  #ifdef FEAT_SPELL

      /* May need to set the spell language.  Can only do this after the buffer

       * has been properly setup. */

      if (!curbuf->b_help && curwin->w_p_spell && *curbuf->b_p_spl != NUL)

! 	(void)did_set_spelllang(curbuf);

  #endif

      redraw_later(NOT_VALID);

***************

*** 2516,2522 ****

      buf_T	*buf;

  {

      wininfo_T	*wip;

!     static pos_T no_position = {1, 0};

      wip = find_wininfo(buf, FALSE);

      if (wip != NULL)

--- 2517,2523 ----

      buf_T	*buf;

  {

      wininfo_T	*wip;

!     static pos_T no_position = INIT_POS_T(1, 0, 0);

      wip = find_wininfo(buf, FALSE);

      if (wip != NULL)

***************

*** 2577,2584 ****

  	{

  	    IObuff[len++] = ' ';

  	} while (--i > 0 && len < IOSIZE - 18);

! 	vim_snprintf((char *)IObuff + len, IOSIZE - len, _("line %ld"),

! 		buf == curbuf ? curwin->w_cursor.lnum

  					       : (long)buflist_findlnum(buf));

  	msg_outtrans(IObuff);

  	out_flush();	    /* output one line at a time */

--- 2578,2585 ----

  	{

  	    IObuff[len++] = ' ';

  	} while (--i > 0 && len < IOSIZE - 18);

! 	vim_snprintf((char *)IObuff + len, (size_t)(IOSIZE - len),

! 		_("line %ld"), buf == curbuf ? curwin->w_cursor.lnum

  					       : (long)buflist_findlnum(buf));

  	msg_outtrans(IObuff);

  	out_flush();	    /* output one line at a time */

***************

*** 2967,2973 ****

      if (fullname > 1)	    /* 2 CTRL-G: include buffer number */

      {

! 	sprintf((char *)buffer, "buf %d: ", curbuf->b_fnum);

  	p = buffer + STRLEN(buffer);

      }

      else

--- 2968,2974 ----

      if (fullname > 1)	    /* 2 CTRL-G: include buffer number */

      {

! 	vim_snprintf((char *)buffer, IOSIZE, "buf %d: ", curbuf->b_fnum);

  	p = buffer + STRLEN(buffer);

      }

      else

***************

*** 3041,3051 ****

  		(long)curbuf->b_ml.ml_line_count,

  		n);

  	validate_virtcol();

! 	col_print(buffer + STRLEN(buffer),

  		   (int)curwin->w_cursor.col + 1, (int)curwin->w_virtcol + 1);

      }

!     (void)append_arg_number(curwin, buffer, !shortmess(SHM_FILE), IOSIZE);

      if (dont_truncate)

      {

--- 3042,3053 ----

  		(long)curbuf->b_ml.ml_line_count,

  		n);

  	validate_virtcol();

! 	len = STRLEN(buffer);

! 	col_print(buffer + len, IOSIZE - len,

  		   (int)curwin->w_cursor.col + 1, (int)curwin->w_virtcol + 1);

      }

!     (void)append_arg_number(curwin, buffer, IOSIZE, !shortmess(SHM_FILE));

      if (dont_truncate)

      {

***************

*** 3073,3087 ****

  }

      void

! col_print(buf, col, vcol)

      char_u  *buf;

      int	    col;

      int	    vcol;

  {

      if (col == vcol)

! 	sprintf((char *)buf, "%d", col);

      else

! 	sprintf((char *)buf, "%d-%d", col, vcol);

  }

  #if defined(FEAT_TITLE) || defined(PROTO)

--- 3075,3090 ----

  }

      void

! col_print(buf, buflen, col, vcol)

      char_u  *buf;

+     size_t  buflen;

      int	    col;

      int	    vcol;

  {

      if (col == vcol)

! 	vim_snprintf((char *)buf, buflen, "%d", col);

      else

! 	vim_snprintf((char *)buf, buflen, "%d-%d", col, vcol);

  }

  #if defined(FEAT_TITLE) || defined(PROTO)

***************

*** 3194,3211 ****

  		if (p == buf + off)

  		    /* must be a help buffer */

  		    vim_strncpy(buf + off, (char_u *)_("help"),

! 							    IOSIZE - off - 1);

  		else

  		    *p = NUL;

  		/* translate unprintable chars */

  		p = transstr(buf + off);

! 		vim_strncpy(buf + off, p, IOSIZE - off - 1);

  		vim_free(p);

  		STRCAT(buf, ")");

  	    }

! 	    append_arg_number(curwin, buf, FALSE, IOSIZE);

  #if defined(FEAT_CLIENTSERVER)

  	    if (serverName != NULL)

--- 3197,3214 ----

  		if (p == buf + off)

  		    /* must be a help buffer */

  		    vim_strncpy(buf + off, (char_u *)_("help"),

! 						  (size_t)(IOSIZE - off - 1));

  		else

  		    *p = NUL;

  		/* translate unprintable chars */

  		p = transstr(buf + off);

! 		vim_strncpy(buf + off, p, (size_t)(IOSIZE - off - 1));

  		vim_free(p);

  		STRCAT(buf, ")");

  	    }

! 	    append_arg_number(curwin, buf, IOSIZE, FALSE);

  #if defined(FEAT_CLIENTSERVER)

  	    if (serverName != NULL)

***************

*** 3520,3526 ****

  		    n = (long)(p - t) - item[groupitem[groupdepth]].maxwid + 1;

  		*t = '<';

! 		mch_memmove(t + 1, t + n, p - (t + n));

  		p = p - n + 1;

  #ifdef FEAT_MBYTE

  		/* Fill up space left over by half a double-wide char. */

--- 3523,3529 ----

  		    n = (long)(p - t) - item[groupitem[groupdepth]].maxwid + 1;

  		*t = '<';

! 		mch_memmove(t + 1, t + n, (size_t)(p - (t + n)));

  		p = p - n + 1;

  #ifdef FEAT_MBYTE

  		/* Fill up space left over by half a double-wide char. */

***************

*** 3550,3556 ****

  		else

  		{

  		    /* fill by inserting characters */

! 		    mch_memmove(t + n - l, t, p - t);

  		    l = n - l;

  		    if (p + l >= out + outlen)

  			l = (long)((out + outlen) - p - 1);

--- 3553,3559 ----

  		else

  		{

  		    /* fill by inserting characters */

! 		    mch_memmove(t + n - l, t, (size_t)(p - t));

  		    l = n - l;

  		    if (p + l >= out + outlen)

  			l = (long)((out + outlen) - p - 1);

***************

*** 3686,3692 ****

  	    p = t;

  #ifdef FEAT_EVAL

! 	    sprintf((char *)tmp, "%d", curbuf->b_fnum);

  	    set_internal_string_var((char_u *)"actual_curbuf", tmp);

  	    o_curbuf = curbuf;

--- 3689,3695 ----

  	    p = t;

  #ifdef FEAT_EVAL

! 	    vim_snprintf((char *)tmp, sizeof(tmp), "%d", curbuf->b_fnum);

  	    set_internal_string_var((char_u *)"actual_curbuf", tmp);

  	    o_curbuf = curbuf;

***************

*** 3753,3765 ****

  	case STL_ALTPERCENT:

  	    str = tmp;

! 	    get_rel_pos(wp, str);

  	    break;

  	case STL_ARGLISTSTAT:

  	    fillable = FALSE;

  	    tmp[0] = 0;

! 	    if (append_arg_number(wp, tmp, FALSE, (int)sizeof(tmp)))

  		str = tmp;

  	    break;

--- 3756,3768 ----

  	case STL_ALTPERCENT:

  	    str = tmp;

! 	    get_rel_pos(wp, str, TMPLEN);

  	    break;

  	case STL_ARGLISTSTAT:

  	    fillable = FALSE;

  	    tmp[0] = 0;

! 	    if (append_arg_number(wp, tmp, (int)sizeof(tmp), FALSE))

  		str = tmp;

  	    break;

***************

*** 3794,3800 ****

  	case STL_BYTEVAL_X:

  	    base = 'X';

  	case STL_BYTEVAL:

! 	    if (wp->w_cursor.col > STRLEN(linecont))

  		num = 0;

  	    else

  	    {

--- 3797,3803 ----

  	case STL_BYTEVAL_X:

  	    base = 'X';

  	case STL_BYTEVAL:

! 	    if (wp->w_cursor.col > (colnr_T)STRLEN(linecont))

  		num = 0;

  	    else

  	    {

***************

*** 3967,3973 ****

  	    if (zeropad)

  		*t++ = '0';

  	    *t++ = '*';

! 	    *t++ = nbase == 16 ? base : (nbase == 8 ? 'o' : 'd');

  	    *t = 0;

  	    for (n = num, l = 1; n >= nbase; n /= nbase)

--- 3970,3976 ----

  	    if (zeropad)

  		*t++ = '0';

  	    *t++ = '*';

! 	    *t++ = nbase == 16 ? base : (char_u)(nbase == 8 ? 'o' : 'd');

  	    *t = 0;

  	    for (n = num, l = 1; n >= nbase; n /= nbase)

***************

*** 4160,4172 ****

  #if defined(FEAT_STL_OPT) || defined(FEAT_CMDL_INFO) \

  	    || defined(FEAT_GUI_TABLINE) || defined(PROTO)

  /*

!  * Get relative cursor position in window into "str[]", in the form 99%, using

!  * "Top", "Bot" or "All" when appropriate.

   */

      void

! get_rel_pos(wp, str)

      win_T	*wp;

!     char_u	*str;

  {

      long	above; /* number of lines above window */

      long	below; /* number of lines below window */

--- 4163,4176 ----

  #if defined(FEAT_STL_OPT) || defined(FEAT_CMDL_INFO) \

  	    || defined(FEAT_GUI_TABLINE) || defined(PROTO)

  /*

!  * Get relative cursor position in window into "buf[buflen]", in the form 99%,

!  * using "Top", "Bot" or "All" when appropriate.

   */

      void

! get_rel_pos(wp, buf, buflen)

      win_T	*wp;

!     char_u	*buf;

!     int		buflen;

  {

      long	above; /* number of lines above window */

      long	below; /* number of lines below window */

***************

*** 4177,4210 ****

  #endif

      below = wp->w_buffer->b_ml.ml_line_count - wp->w_botline + 1;

      if (below <= 0)

! 	STRCPY(str, above == 0 ? _("All") : _("Bot"));

      else if (above <= 0)

! 	STRCPY(str, _("Top"));

      else

! 	sprintf((char *)str, "%2d%%", above > 1000000L

  				    ? (int)(above / ((above + below) / 100L))

  				    : (int)(above * 100L / (above + below)));

  }

  #endif

  /*

!  * Append (file 2 of 8) to 'buf', if editing more than one file.

   * Return TRUE if it was appended.

   */

!     int

! append_arg_number(wp, buf, add_file, maxlen)

      win_T	*wp;

      char_u	*buf;

      int		add_file;	/* Add "file" before the arg number */

-     int		maxlen;		/* maximum nr of chars in buf or zero*/

  {

      char_u	*p;

      if (ARGCOUNT <= 1)		/* nothing to do */

  	return FALSE;

!     p = buf + STRLEN(buf);		/* go to the end of the buffer */

!     if (maxlen && p - buf + 35 >= maxlen) /* getting too long */

  	return FALSE;

      *p++ = ' ';

      *p++ = '(';

--- 4181,4215 ----

  #endif

      below = wp->w_buffer->b_ml.ml_line_count - wp->w_botline + 1;

      if (below <= 0)

! 	vim_strncpy(buf, (char_u *)(above == 0 ? _("All") : _("Bot")),

! 							(size_t)(buflen - 1));

      else if (above <= 0)

! 	vim_strncpy(buf, (char_u *)_("Top"), (size_t)(buflen - 1));

      else

! 	vim_snprintf((char *)buf, (size_t)buflen, "%2d%%", above > 1000000L

  				    ? (int)(above / ((above + below) / 100L))

  				    : (int)(above * 100L / (above + below)));

  }

  #endif

  /*

!  * Append (file 2 of 8) to "buf[buflen]", if editing more than one file.

   * Return TRUE if it was appended.

   */

!     static int

! append_arg_number(wp, buf, buflen, add_file)

      win_T	*wp;

      char_u	*buf;

+     int		buflen;

      int		add_file;	/* Add "file" before the arg number */

  {

      char_u	*p;

      if (ARGCOUNT <= 1)		/* nothing to do */

  	return FALSE;

!     p = buf + STRLEN(buf);	/* go to the end of the buffer */

!     if (p - buf + 35 >= buflen)	/* getting too long */

  	return FALSE;

      *p++ = ' ';

      *p++ = '(';

***************

*** 4213,4219 ****

  	STRCPY(p, "file ");

  	p += 5;

      }

!     sprintf((char *)p, wp->w_arg_idx_invalid ? "(%d) of %d)"

  				  : "%d of %d)", wp->w_arg_idx + 1, ARGCOUNT);

      return TRUE;

  }

--- 4218,4225 ----

  	STRCPY(p, "file ");

  	p += 5;

      }

!     vim_snprintf((char *)p, (size_t)(buflen - (p - buf)),

! 		wp->w_arg_idx_invalid ? "(%d) of %d)"

  				  : "%d of %d)", wp->w_arg_idx + 1, ARGCOUNT);

      return TRUE;

  }

***************

*** 4996,5002 ****

  	if (tab != NULL)

  	{

  	    *tab++ = '\0';

! 	    col = atoi((char *)tab);

  	    tab = vim_strrchr(xline, '\t');

  	    if (tab != NULL)

  	    {

--- 5002,5008 ----

  	if (tab != NULL)

  	{

  	    *tab++ = '\0';

! 	    col = (colnr_T)atoi((char *)tab);

  	    tab = vim_strrchr(xline, '\t');

  	    if (tab != NULL)

  	    {

***************

*** 5034,5039 ****

--- 5040,5046 ----

  #endif

      char_u	*line;

      int		max_buffers;

+     size_t	len;

      if (find_viminfo_parameter('%') == NULL)

  	return;

***************

*** 5042,5048 ****

      max_buffers = get_viminfo_parameter('%');

      /* Allocate room for the file name, lnum and col. */

!     line = alloc(MAXPATHL + 40);

      if (line == NULL)

  	return;

--- 5049,5056 ----

      max_buffers = get_viminfo_parameter('%');

      /* Allocate room for the file name, lnum and col. */

! #define LINE_BUF_LEN (MAXPATHL + 40)

!     line = alloc(LINE_BUF_LEN);

      if (line == NULL)

  	return;

***************

*** 5068,5074 ****

  	    break;

  	putc('%', fp);

  	home_replace(NULL, buf->b_ffname, line, MAXPATHL, TRUE);

! 	sprintf((char *)line + STRLEN(line), "\t%ld\t%d",

  			(long)buf->b_last_cursor.lnum,

  			buf->b_last_cursor.col);

  	viminfo_writestring(fp, line);

--- 5076,5083 ----

  	    break;

  	putc('%', fp);

  	home_replace(NULL, buf->b_ffname, line, MAXPATHL, TRUE);

! 	len = STRLEN(line);

! 	vim_snprintf((char *)line + len, len - LINE_BUF_LEN, "\t%ld\t%d",

  			(long)buf->b_last_cursor.lnum,

  			buf->b_last_cursor.col);

  	viminfo_writestring(fp, line);

***************

*** 5226,5232 ****

      return;

  }

!     int

  buf_change_sign_type(buf, markId, typenr)

      buf_T	*buf;		/* buffer to store sign in */

      int		markId;		/* sign ID */

--- 5235,5241 ----

      return;

  }

!     linenr_T

  buf_change_sign_type(buf, markId, typenr)

      buf_T	*buf;		/* buffer to store sign in */

      int		markId;		/* sign ID */

***************

*** 5243,5252 ****

  	}

      }

!     return 0;

  }

!     int_u

  buf_getsigntype(buf, lnum, type)

      buf_T	*buf;

      linenr_T	lnum;

--- 5252,5261 ----

  	}

      }

!     return (linenr_T)0;

  }

!     int

  buf_getsigntype(buf, lnum, type)

      buf_T	*buf;

      linenr_T	lnum;

*** ../vim-7.2.166/src/charset.c	2008-07-24 21:30:44.000000000 +0200

--- src/charset.c	2009-05-05 18:17:11.000000000 +0200

***************

*** 17,23 ****

  static int win_nolbr_chartabsize __ARGS((win_T *wp, char_u *s, colnr_T col, int *headp));

  #endif

! static int nr2hex __ARGS((int c));

  static int    chartab_initialized = FALSE;

--- 17,23 ----

  static int win_nolbr_chartabsize __ARGS((win_T *wp, char_u *s, colnr_T col, int *headp));

  #endif

! static unsigned nr2hex __ARGS((unsigned c));

  static int    chartab_initialized = FALSE;

***************

*** 664,670 ****

      }

  #endif

      buf[++i] = nr2hex((unsigned)c >> 4);

!     buf[++i] = nr2hex(c);

      buf[++i] = '>';

      buf[++i] = NUL;

  }

--- 664,670 ----

      }

  #endif

      buf[++i] = nr2hex((unsigned)c >> 4);

!     buf[++i] = nr2hex((unsigned)c);

      buf[++i] = '>';

      buf[++i] = NUL;

  }

***************

*** 674,682 ****

   * Lower case letters are used to avoid the confusion of <F1> being 0xf1 or

   * function key 1.

   */

!     static int

  nr2hex(c)

!     int		c;

  {