To: vim-dev@vim.org Subject: Patch 6.2f.029 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.2f.029 Problem: Mixing use of int and enum. Solution: Adjust argument type of cs_usage_msg(). Fix wrong typedef. Files: src/if_cscope.c, src/if_cscope.h *** ../vim-6.2f.028/src/if_cscope.c Tue May 27 22:31:48 2003 --- src/if_cscope.c Fri May 30 11:51:23 2003 *************** *** 32,38 **** #endif #include "if_cscope.h" ! static void cs_usage_msg __ARGS((int x)); static int cs_add __ARGS((exarg_T *eap)); static void cs_stat_emsg __ARGS((char *fname)); static int cs_add_common __ARGS((char *, char *, char *)); --- 32,38 ---- #endif #include "if_cscope.h" ! static void cs_usage_msg __ARGS((csid_e x)); static int cs_add __ARGS((exarg_T *eap)); static void cs_stat_emsg __ARGS((char *fname)); static int cs_add_common __ARGS((char *, char *, char *)); *************** *** 89,97 **** static void cs_usage_msg(x) ! int x; { ! (void)EMSG2(_("E560: Usage: cs[cope] %s"), cs_cmds[x].usage); } /* --- 89,97 ---- static void cs_usage_msg(x) ! csid_e x; { ! (void)EMSG2(_("E560: Usage: cs[cope] %s"), cs_cmds[(int)x].usage); } /* *** ../vim-6.2f.028/src/if_cscope.h Mon May 26 22:15:06 2003 --- src/if_cscope.h Fri May 30 11:50:20 2003 *************** *** 81,87 **** FILE * to_fp; /* to cscope: FILE. */ } csinfo_T; ! enum { Add, Find, Help, Kill, Reset, Show } csid_e; typedef enum { Store, --- 81,87 ---- FILE * to_fp; /* to cscope: FILE. */ } csinfo_T; ! typedef enum { Add, Find, Help, Kill, Reset, Show } csid_e; typedef enum { Store, *** ../vim-6.2f.028/src/version.c Fri May 30 12:10:41 2003 --- src/version.c Fri May 30 12:12:06 2003 *************** *** 632,633 **** --- 632,635 ---- { /* Add new patch number below this line */ + /**/ + 29, /**/ -- How To Keep A Healthy Level Of Insanity: 15. Five days in advance, tell your friends you can't attend their party because you're not in the mood. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ \\\ Project leader for A-A-P -- http://www.A-A-P.org /// \\\ Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///