To: vim-dev@vim.org

Subject: Patch 7.2.174

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.174

Problem:    Too many warnings from gcc -Wextra.

Solution:   Change initializer.  Add UNUSED.  Add type casts.

Files:      src/edit.c, src/eval.c, src/ex_cmds.c, src/ex_docmd.c,

            src/ex_getln.c, src/fileio.c, getchar.c, globals.h, main.c,

            memline.c, message.c, src/misc1.c, src/move.c, src/normal.c,

            src/option.c, src/os_unix.c, src/os_unix.h, src/regexp.c,

            src/search.c, src/tag.c

*** ../vim-7.2.173/src/edit.c	2009-05-14 22:19:19.000000000 +0200

--- src/edit.c	2009-05-15 21:06:07.000000000 +0200

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

*** 8991,8997 ****

  	foldOpenCursor();

  #endif

      undisplay_dollar();

!     if (gchar_cursor() != NUL || virtual_active()

  	    )

      {

  	start_arrow(&curwin->w_cursor);

--- 8992,9001 ----

  	foldOpenCursor();

  #endif

      undisplay_dollar();

!     if (gchar_cursor() != NUL

! #ifdef FEAT_VIRTUALEDIT

! 	    || virtual_active()

! #endif

  	    )

      {

  	start_arrow(&curwin->w_cursor);

*** ../vim-7.2.173/src/eval.c	2009-04-22 16:07:57.000000000 +0200

--- src/eval.c	2009-05-15 21:18:08.000000000 +0200

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

*** 8303,8312 ****

  /*

   * "argc()" function

   */

- /* ARGSUSED */

      static void

  f_argc(argvars, rettv)

!     typval_T	*argvars;

      typval_T	*rettv;

  {

      rettv->vval.v_number = ARGCOUNT;

--- 8303,8311 ----

  /*

   * "argc()" function

   */

      static void

  f_argc(argvars, rettv)

!     typval_T	*argvars UNUSED;

      typval_T	*rettv;

  {

      rettv->vval.v_number = ARGCOUNT;

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

*** 8315,8324 ****

  /*

   * "argidx()" function

   */

- /* ARGSUSED */

      static void

  f_argidx(argvars, rettv)

!     typval_T	*argvars;

      typval_T	*rettv;

  {

      rettv->vval.v_number = curwin->w_arg_idx;

--- 8314,8322 ----

  /*

   * "argidx()" function

   */

      static void

  f_argidx(argvars, rettv)

!     typval_T	*argvars UNUSED;

      typval_T	*rettv;

  {

      rettv->vval.v_number = curwin->w_arg_idx;

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

*** 8396,8405 ****

  /*

   * "browse(save, title, initdir, default)" function

   */

- /* ARGSUSED */

      static void

  f_browse(argvars, rettv)

!     typval_T	*argvars;

      typval_T	*rettv;

  {

  #ifdef FEAT_BROWSE

--- 8394,8402 ----

  /*

   * "browse(save, title, initdir, default)" function

   */

      static void

  f_browse(argvars, rettv)

!     typval_T	*argvars UNUSED;

      typval_T	*rettv;

  {

  #ifdef FEAT_BROWSE

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

*** 8431,8440 ****

  /*

   * "browsedir(title, initdir)" function

   */

- /* ARGSUSED */

      static void

  f_browsedir(argvars, rettv)

!     typval_T	*argvars;

      typval_T	*rettv;

  {

  #ifdef FEAT_BROWSE

--- 8428,8436 ----

  /*

   * "browsedir(title, initdir)" function

   */

      static void

  f_browsedir(argvars, rettv)

!     typval_T	*argvars UNUSED;

      typval_T	*rettv;

  {

  #ifdef FEAT_BROWSE

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

*** 8801,8810 ****

  /*

   * "changenr()" function

   */

- /*ARGSUSED*/

      static void

  f_changenr(argvars, rettv)

!     typval_T	*argvars;

      typval_T	*rettv;

  {

      rettv->vval.v_number = curbuf->b_u_seq_cur;

--- 8797,8805 ----

  /*

   * "changenr()" function

   */

      static void

  f_changenr(argvars, rettv)

!     typval_T	*argvars UNUSED;

      typval_T	*rettv;

  {

      rettv->vval.v_number = curbuf->b_u_seq_cur;

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

*** 8854,8863 ****

  /*

   * "clearmatches()" function

   */

- /*ARGSUSED*/

      static void

  f_clearmatches(argvars, rettv)

!     typval_T	*argvars;

      typval_T	*rettv;

  {

  #ifdef FEAT_SEARCH_EXTRA

--- 8849,8857 ----

  /*

   * "clearmatches()" function

   */

      static void

  f_clearmatches(argvars, rettv)

!     typval_T	*argvars UNUSED;

      typval_T	*rettv;

  {

  #ifdef FEAT_SEARCH_EXTRA

*** ../vim-7.2.173/src/ex_cmds.c	2009-05-14 22:19:19.000000000 +0200

--- src/ex_cmds.c	2009-05-15 20:42:18.000000000 +0200

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

*** 4040,4047 ****

--- 4040,4049 ----

  	bigness = curwin->w_height;

      else if (firstwin == lastwin)

  	bigness = curwin->w_p_scr * 2;

+ #ifdef FEAT_WINDOWS

      else

  	bigness = curwin->w_height - 3;

+ #endif

      if (bigness < 1)

  	bigness = 1;

*** ../vim-7.2.173/src/ex_docmd.c	2009-05-13 18:54:14.000000000 +0200

--- src/ex_docmd.c	2009-05-15 20:47:58.000000000 +0200

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

*** 1578,1588 ****

   * If "fgetline" is get_loop_line(), return TRUE if the getline it uses equals

   * "func".  * Otherwise return TRUE when "fgetline" equals "func".

   */

- /*ARGSUSED*/

      int

  getline_equal(fgetline, cookie, func)

      char_u	*(*fgetline) __ARGS((int, void *, int));

!     void	*cookie;		/* argument for fgetline() */

      char_u	*(*func) __ARGS((int, void *, int));

  {

  #ifdef FEAT_EVAL

--- 1578,1587 ----

   * If "fgetline" is get_loop_line(), return TRUE if the getline it uses equals

   * "func".  * Otherwise return TRUE when "fgetline" equals "func".

   */

      int

  getline_equal(fgetline, cookie, func)

      char_u	*(*fgetline) __ARGS((int, void *, int));

!     void	*cookie UNUSED;		/* argument for fgetline() */

      char_u	*(*func) __ARGS((int, void *, int));

  {

  #ifdef FEAT_EVAL

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

*** 1610,1619 ****

   * If "fgetline" is get_loop_line(), return the cookie used by the original

   * getline function.  Otherwise return "cookie".

   */

- /*ARGSUSED*/

      void *

  getline_cookie(fgetline, cookie)

!     char_u	*(*fgetline) __ARGS((int, void *, int));

      void	*cookie;		/* argument for fgetline() */

  {

  # ifdef FEAT_EVAL

--- 1609,1617 ----

   * If "fgetline" is get_loop_line(), return the cookie used by the original

   * getline function.  Otherwise return "cookie".

   */

      void *

  getline_cookie(fgetline, cookie)

!     char_u	*(*fgetline) __ARGS((int, void *, int)) UNUSED;

      void	*cookie;		/* argument for fgetline() */

  {

  # ifdef FEAT_EVAL

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

*** 2754,2764 ****

   * "full" is set to TRUE if the whole command name matched.

   * Returns NULL for an ambiguous user command.

   */

- /*ARGSUSED*/

      static char_u *

  find_command(eap, full)

      exarg_T	*eap;

!     int		*full;

  {

      int		len;

      char_u	*p;

--- 2752,2761 ----

   * "full" is set to TRUE if the whole command name matched.

   * Returns NULL for an ambiguous user command.

   */

      static char_u *

  find_command(eap, full)

      exarg_T	*eap;

!     int		*full UNUSED;

  {

      int		len;

      char_u	*p;

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

*** 5053,5062 ****

  /*

   * Function given to ExpandGeneric() to obtain the list of command names.

   */

- /*ARGSUSED*/

      char_u *

  get_command_name(xp, idx)

!     expand_T	*xp;

      int		idx;

  {

      if (idx >= (int)CMD_SIZE)

--- 5050,5058 ----

  /*

   * Function given to ExpandGeneric() to obtain the list of command names.

   */

      char_u *

  get_command_name(xp, idx)

!     expand_T	*xp UNUSED;

      int		idx;

  {

      if (idx >= (int)CMD_SIZE)

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

*** 5573,5582 ****

   * ":comclear"

   * Clear all user commands, global and for current buffer.

   */

- /*ARGSUSED*/

      void

  ex_comclear(eap)

!     exarg_T	*eap;

  {

      uc_clear(&ucmds);

      uc_clear(&curbuf->b_ucmds);

--- 5569,5577 ----

   * ":comclear"

   * Clear all user commands, global and for current buffer.

   */

      void

  ex_comclear(eap)

!     exarg_T	*eap UNUSED;

  {

      uc_clear(&ucmds);

      uc_clear(&curbuf->b_ucmds);

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

*** 6072,6081 ****

  /*

   * Function given to ExpandGeneric() to obtain the list of user command names.

   */

- /*ARGSUSED*/

      char_u *

  get_user_commands(xp, idx)

!     expand_T	*xp;

      int		idx;

  {

      if (idx < curbuf->b_ucmds.ga_len)

--- 6067,6075 ----

  /*

   * Function given to ExpandGeneric() to obtain the list of user command names.

   */

      char_u *

  get_user_commands(xp, idx)

!     expand_T	*xp UNUSED;

      int		idx;

  {

      if (idx < curbuf->b_ucmds.ga_len)

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

*** 6090,6099 ****

   * Function given to ExpandGeneric() to obtain the list of user command

   * attributes.

   */

- /*ARGSUSED*/

      char_u *

  get_user_cmd_flags(xp, idx)

!     expand_T	*xp;

      int		idx;

  {

      static char *user_cmd_flags[] =

--- 6084,6092 ----

   * Function given to ExpandGeneric() to obtain the list of user command

   * attributes.

   */

      char_u *

  get_user_cmd_flags(xp, idx)

!     expand_T	*xp UNUSED;

      int		idx;

  {

      static char *user_cmd_flags[] =

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

*** 6108,6117 ****

  /*

   * Function given to ExpandGeneric() to obtain the list of values for -nargs.

   */

- /*ARGSUSED*/

      char_u *

  get_user_cmd_nargs(xp, idx)

!     expand_T	*xp;

      int		idx;

  {

      static char *user_cmd_nargs[] = {"0", "1", "*", "?", "+"};

--- 6101,6109 ----

  /*

   * Function given to ExpandGeneric() to obtain the list of values for -nargs.

   */

      char_u *

  get_user_cmd_nargs(xp, idx)

!     expand_T	*xp UNUSED;

      int		idx;

  {

      static char *user_cmd_nargs[] = {"0", "1", "*", "?", "+"};

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

*** 6124,6133 ****

  /*

   * Function given to ExpandGeneric() to obtain the list of values for -complete.

   */

- /*ARGSUSED*/

      char_u *

  get_user_cmd_complete(xp, idx)

!     expand_T	*xp;

      int		idx;

  {

      return (char_u *)command_complete[idx].name;

--- 6116,6124 ----

  /*

   * Function given to ExpandGeneric() to obtain the list of values for -complete.

   */

      char_u *

  get_user_cmd_complete(xp, idx)

!     expand_T	*xp UNUSED;

      int		idx;

  {

      return (char_u *)command_complete[idx].name;

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

*** 6305,6314 ****

  /*

   * ":cquit".

   */

- /*ARGSUSED*/

      static void

  ex_cquit(eap)

!     exarg_T	*eap;

  {

      getout(1);	/* this does not always pass on the exit code to the Manx

  		   compiler. why? */

--- 6296,6304 ----

  /*

   * ":cquit".

   */

      static void

  ex_cquit(eap)

!     exarg_T	*eap UNUSED;

  {

      getout(1);	/* this does not always pass on the exit code to the Manx

  		   compiler. why? */

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

*** 6750,6759 ****

  /*

   * ":shell".

   */

- /*ARGSUSED*/

      static void

  ex_shell(eap)

!     exarg_T	*eap;

  {

      do_shell(NULL, 0);

  }

--- 6740,6748 ----

  /*

   * ":shell".

   */

      static void

  ex_shell(eap)

!     exarg_T	*eap UNUSED;

  {

      do_shell(NULL, 0);

  }

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

*** 7057,7066 ****

  /*

   * ":preserve".

   */

- /*ARGSUSED*/

      static void

  ex_preserve(eap)

!     exarg_T	*eap;

  {

      curbuf->b_flags |= BF_PRESERVED;

      ml_preserve(curbuf, TRUE);

--- 7046,7054 ----

  /*

   * ":preserve".

   */

      static void

  ex_preserve(eap)

!     exarg_T	*eap UNUSED;

  {

      curbuf->b_flags |= BF_PRESERVED;

      ml_preserve(curbuf, TRUE);

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

*** 7292,7301 ****

  /*

   * :tabs command: List tabs and their contents.

   */

- /*ARGSUSED*/

      static void

  ex_tabs(eap)

!     exarg_T	*eap;

  {

      tabpage_T	*tp;

      win_T	*wp;

--- 7280,7288 ----

  /*

   * :tabs command: List tabs and their contents.

   */

      static void

  ex_tabs(eap)

!     exarg_T	*eap UNUSED;

  {

      tabpage_T	*tp;

      win_T	*wp;

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

*** 7482,7488 ****

  /*

   * ":edit <file>" command and alikes.

   */

- /*ARGSUSED*/

      void

  do_exedit(eap, old_curwin)

      exarg_T	*eap;

--- 7469,7474 ----

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

*** 7694,7703 ****

  }

  #endif

- /*ARGSUSED*/

      static void

  ex_swapname(eap)

!     exarg_T	*eap;

  {

      if (curbuf->b_ml.ml_mfp == NULL || curbuf->b_ml.ml_mfp->mf_fname == NULL)

  	MSG(_("No swap file"));

--- 7680,7688 ----

  }

  #endif

      static void

  ex_swapname(eap)

!     exarg_T	*eap UNUSED;

  {

      if (curbuf->b_ml.ml_mfp == NULL || curbuf->b_ml.ml_mfp->mf_fname == NULL)

  	MSG(_("No swap file"));

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

*** 7710,7719 ****

   * offset.

   * (1998-11-02 16:21:01  R. Edward Ralston <eralston@computer.org>)

   */

- /*ARGSUSED*/

      static void

  ex_syncbind(eap)

!     exarg_T	*eap;

  {

  #ifdef FEAT_SCROLLBIND

      win_T	*wp;

--- 7695,7703 ----

   * offset.

   * (1998-11-02 16:21:01  R. Edward Ralston <eralston@computer.org>)

   */

      static void

  ex_syncbind(eap)

!     exarg_T	*eap UNUSED;

  {

  #ifdef FEAT_SCROLLBIND

      win_T	*wp;

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

*** 7983,7992 ****

  /*

   * ":pwd".

   */

- /*ARGSUSED*/

      static void

  ex_pwd(eap)

!     exarg_T	*eap;

  {

      if (mch_dirname(NameBuff, MAXPATHL) == OK)

      {

--- 7967,7975 ----

  /*

   * ":pwd".

   */

      static void

  ex_pwd(eap)

!     exarg_T	*eap UNUSED;

  {

      if (mch_dirname(NameBuff, MAXPATHL) == OK)

      {

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

*** 8417,8426 ****

  /*

   * ":undo".

   */

- /*ARGSUSED*/

      static void

  ex_undo(eap)

!     exarg_T	*eap;

  {

      if (eap->addr_count == 1)	    /* :undo 123 */

  	undo_time(eap->line2, FALSE, TRUE);

--- 8400,8408 ----

  /*

   * ":undo".

   */

      static void

  ex_undo(eap)

!     exarg_T	*eap UNUSED;

  {

      if (eap->addr_count == 1)	    /* :undo 123 */

  	undo_time(eap->line2, FALSE, TRUE);

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

*** 8431,8440 ****

  /*

   * ":redo".

   */

- /*ARGSUSED*/

      static void

  ex_redo(eap)

!     exarg_T	*eap;

  {

      u_redo(1);

  }

--- 8413,8421 ----

  /*

   * ":redo".

   */

      static void

  ex_redo(eap)

!     exarg_T	*eap UNUSED;

  {

      u_redo(1);

  }

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

*** 8442,8448 ****

  /*

   * ":earlier" and ":later".

   */

- /*ARGSUSED*/

      static void

  ex_later(eap)

      exarg_T	*eap;

--- 8423,8428 ----

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

*** 8627,8636 ****

  /*

   * ":redrawstatus": force redraw of status line(s)

   */

- /*ARGSUSED*/

      static void

  ex_redrawstatus(eap)

!     exarg_T	*eap;

  {

  #if defined(FEAT_WINDOWS)

      int		r = RedrawingDisabled;

--- 8607,8615 ----

  /*

   * ":redrawstatus": force redraw of status line(s)

   */

      static void

  ex_redrawstatus(eap)

!     exarg_T	*eap UNUSED;

  {

  #if defined(FEAT_WINDOWS)

      int		r = RedrawingDisabled;

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

*** 8891,8901 ****

  #if ((defined(FEAT_SESSION) || defined(FEAT_EVAL)) && defined(vim_mkdir)) \

  	|| defined(PROTO)

- /*ARGSUSED*/

      int

  vim_mkdir_emsg(name, prot)

      char_u	*name;

!     int		prot;

  {

      if (vim_mkdir(name, prot) != 0)

      {

--- 8870,8879 ----

  #if ((defined(FEAT_SESSION) || defined(FEAT_EVAL)) && defined(vim_mkdir)) \

  	|| defined(PROTO)

      int

  vim_mkdir_emsg(name, prot)

      char_u	*name;

!     int		prot UNUSED;

  {

      if (vim_mkdir(name, prot) != 0)

      {

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

*** 10968,10977 ****

  }

  #endif

- /*ARGSUSED*/

      static void

  ex_digraphs(eap)

!     exarg_T	*eap;

  {

  #ifdef FEAT_DIGRAPHS

      if (*eap->arg != NUL)

--- 10946,10954 ----

  }

  #endif

      static void

  ex_digraphs(eap)

!     exarg_T	*eap UNUSED;

  {

  #ifdef FEAT_DIGRAPHS

      if (*eap->arg != NUL)

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

*** 11005,11014 ****

  /*

   * ":nohlsearch"

   */

- /*ARGSUSED*/

      static void

  ex_nohlsearch(eap)

!     exarg_T	*eap;

  {

      no_hlsearch = TRUE;

      redraw_all_later(SOME_VALID);

--- 10982,10990 ----

  /*

   * ":nohlsearch"

   */

      static void

  ex_nohlsearch(eap)

!     exarg_T	*eap UNUSED;

  {

      no_hlsearch = TRUE;

      redraw_all_later(SOME_VALID);

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

*** 11087,11096 ****

  /*

   * ":X": Get crypt key

   */

- /*ARGSUSED*/

      static void

  ex_X(eap)

!     exarg_T	*eap;

  {

      (void)get_crypt_key(TRUE, TRUE);

  }

--- 11063,11071 ----

  /*

   * ":X": Get crypt key

   */

      static void

  ex_X(eap)

!     exarg_T	*eap UNUSED;

  {

      (void)get_crypt_key(TRUE, TRUE);

  }

*** ../vim-7.2.173/src/ex_getln.c	2009-04-29 18:44:38.000000000 +0200

--- src/ex_getln.c	2009-05-15 20:49:22.000000000 +0200

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

*** 140,150 ****

   * Return pointer to allocated string if there is a commandline, NULL

   * otherwise.

   */

- /*ARGSUSED*/

      char_u *

  getcmdline(firstc, count, indent)

      int		firstc;

!     long	count;		/* only used for incremental search */

      int		indent;		/* indent for inside conditionals */

  {

      int		c;

--- 140,149 ----

   * Return pointer to allocated string if there is a commandline, NULL

   * otherwise.

   */

      char_u *

  getcmdline(firstc, count, indent)

      int		firstc;

!     long	count UNUSED;	/* only used for incremental search */

      int		indent;		/* indent for inside conditionals */

  {

      int		c;

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

*** 2113,2123 ****

  /*

   * Get an Ex command line for the ":" command.

   */

- /* ARGSUSED */

      char_u *

! getexline(c, dummy, indent)

      int		c;		/* normally ':', NUL for ":append" */

!     void	*dummy;		/* cookie not used */

      int		indent;		/* indent for inside conditionals */

  {

      /* When executing a register, remove ':' that's in front of each line. */

--- 2112,2121 ----

  /*

   * Get an Ex command line for the ":" command.

   */

      char_u *

! getexline(c, cookie, indent)

      int		c;		/* normally ':', NUL for ":append" */

!     void	*cookie UNUSED;

      int		indent;		/* indent for inside conditionals */

  {

      /* When executing a register, remove ':' that's in front of each line. */

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

*** 2132,2143 ****

   * mappings or abbreviations.

   * Returns a string in allocated memory or NULL.

   */

- /* ARGSUSED */

      char_u *

! getexmodeline(promptc, dummy, indent)

      int		promptc;	/* normally ':', NUL for ":append" and '?' for

  				   :s prompt */

!     void	*dummy;		/* cookie not used */

      int		indent;		/* indent for inside conditionals */

  {

      garray_T	line_ga;

--- 2130,2140 ----

   * mappings or abbreviations.

   * Returns a string in allocated memory or NULL.

   */

      char_u *

! getexmodeline(promptc, cookie, indent)

      int		promptc;	/* normally ':', NUL for ":append" and '?' for

  				   :s prompt */

!     void	*cookie UNUSED;

      int		indent;		/* indent for inside conditionals */

  {

      garray_T	line_ga;

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

*** 3832,3842 ****

   * Returns EXPAND_NOTHING when the character that triggered expansion should

   * be inserted like a normal character.

   */

- /*ARGSUSED*/

      static int

  showmatches(xp, wildmenu)

      expand_T	*xp;

!     int		wildmenu;

  {

  #define L_SHOWFILE(m) (showtail ? sm_gettail(files_found[m]) : files_found[m])

      int		num_files;

--- 3829,3838 ----

   * Returns EXPAND_NOTHING when the character that triggered expansion should

   * be inserted like a normal character.

   */

      static int

  showmatches(xp, wildmenu)

      expand_T	*xp;

!     int		wildmenu UNUSED;

  {

  #define L_SHOWFILE(m) (showtail ? sm_gettail(files_found[m]) : files_found[m])

      int		num_files;

*** ../vim-7.2.173/src/fileio.c	2009-05-13 20:47:07.000000000 +0200

--- src/fileio.c	2009-05-15 20:52:40.000000000 +0200

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

*** 3498,3504 ****

  		    if (mch_stat((char *)IObuff, &st) < 0

  			    || st.st_uid != st_old.st_uid

  			    || st.st_gid != st_old.st_gid

! 			    || st.st_mode != perm)

  			backup_copy = TRUE;

  # endif

  		    /* Close the file before removing it, on MS-Windows we

--- 3498,3504 ----

  		    if (mch_stat((char *)IObuff, &st) < 0

  			    || st.st_uid != st_old.st_uid

  			    || st.st_gid != st_old.st_gid

! 			    || (long)st.st_mode != perm)

  			backup_copy = TRUE;

  # endif

  		    /* Close the file before removing it, on MS-Windows we

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

*** 5963,5969 ****

  	else if (*ext == '.')

  #endif

  	{

! 	    if (s - ptr > (size_t)8)

  	    {

  		s = ptr + 8;

  		*s = '\0';

--- 5971,5977 ----

  	else if (*ext == '.')

  #endif

  	{

! 	    if ((size_t)(s - ptr) > (size_t)8)

  	    {

  		s = ptr + 8;

  		*s = '\0';

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

*** 6460,6470 ****

   * return 2 if a message has been displayed.

   * return 0 otherwise.

   */

- /*ARGSUSED*/

      int

  buf_check_timestamp(buf, focus)

      buf_T	*buf;

!     int		focus;		/* called for GUI focus event */

  {

      struct stat	st;

      int		stat_res;

--- 6468,6477 ----

   * return 2 if a message has been displayed.

   * return 0 otherwise.

   */

      int

  buf_check_timestamp(buf, focus)