7.2.176

   1 To: vim-dev@vim.org
   2 Subject: Patch 7.2.176
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.2.176
  11 Problem:    Exceptions for splint are not useful.
  12 Solution:   Remove the S_SPLINT_S ifdefs.
  13 Files:      src/edit.c, src/ex_cmds.c, src/ex_docmd.c, src/os_unix.c,
  14             src/os_unix.h, src/os_unixx.h, src/structs.h, src/term.h
  15
  16
  17 *** ../vim-7.2.175/src/edit.c   2009-05-15 21:31:11.000000000 +0200
  18 --- src/edit.c  2009-05-16 16:18:35.000000000 +0200
  19 ***************
  20 *** 69,79 ****
  21       compl_T   *cp_prev;
  22       char_u    *cp_str;        /* matched text */
  23       char      cp_icase;       /* TRUE or FALSE: ignore case */
  24 - #ifdef S_SPLINT_S  /* splint can't handle array of pointers */
  25 -     char_u    **cp_text;      /* text for the menu */
  26 - #else
  27       char_u    *(cp_text[CPT_COUNT]);  /* text for the menu */
  28 - #endif
  29       char_u    *cp_fname;      /* file containing the match, allocated when
  30                                  * cp_flags has FREE_FNAME */
  31       int               cp_flags;       /* ORIGINAL_TEXT, CONT_S_IPOS or FREE_FNAME */
  32 --- 69,75 ----
  33 ***************
  34 *** 3835,3845 ****
  35       char_u    *word;
  36       int               icase = FALSE;
  37       int               adup = FALSE;
  38 - #ifdef S_SPLINT_S  /* splint doesn't parse array of pointers correctly */
  39 -     char_u    **cptext;
  40 - #else
  41       char_u    *(cptext[CPT_COUNT]);
  42 - #endif
  43
  44       if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL)
  45       {
  46 --- 3831,3837 ----
  47 *** ../vim-7.2.175/src/ex_cmds.c        2009-05-15 21:31:11.000000000 +0200
  48 --- src/ex_cmds.c       2009-05-16 16:18:56.000000000 +0200
  49 ***************
  50 *** 5776,5785 ****
  51   {
  52       char_u    *s, *d;
  53       int               i;
  54 - #ifdef S_SPLINT_S  /* splint doesn't understand array of pointers */
  55 -     static char **mtable;
  56 -     static char **rtable;
  57 - #else
  58       static char *(mtable[]) = {"*", "g*", "[*", "]*", ":*",
  59                                "/*", "/\\*", "\"*", "**",
  60                                "/\\(\\)",
  61 --- 5776,5781 ----
  62 ***************
  63 *** 5794,5800 ****
  64                                "/\\\\?", "/\\\\z(\\\\)", "\\\\=", ":s\\\\=",
  65                                "\\[count]", "\\[quotex]", "\\[range]",
  66                                "\\[pattern]", "\\\\bar", "/\\\\%\\$"};
  67 - #endif
  68       int flags;
  69
  70       d = IObuff;                   /* assume IObuff is long enough! */
  71 --- 5790,5795 ----
  72 *** ../vim-7.2.175/src/ex_docmd.c       2009-05-15 21:31:11.000000000 +0200
  73 --- src/ex_docmd.c      2009-05-16 16:19:26.000000000 +0200
  74 ***************
  75 *** 9395,9407 ****
  76   {
  77       int               len;
  78       int               i;
  79 ! #ifdef S_SPLINT_S  /* splint can't handle array of pointers */
  80 !     static char **spec_str;
  81 !     static char *(nospec_str[])
  82 ! #else
  83 !     static char *(spec_str[])
  84 ! #endif
  85 !       = {
  86                     "%",
  87   #define SPEC_PERC   0
  88                     "#",
  89 --- 9395,9401 ----
  90   {
  91       int               len;
  92       int               i;
  93 !     static char *(spec_str[]) = {
  94                     "%",
  95   #define SPEC_PERC   0
  96                     "#",
  97 *** ../vim-7.2.175/src/os_unix.c        2009-05-15 21:31:11.000000000 +0200
  98 --- src/os_unix.c       2009-05-16 16:20:00.000000000 +0200
  99 ***************
 100 *** 199,207 ****
 101   #endif
 102
 103   #ifndef SIG_ERR
 104 ! # ifndef S_SPLINT_S
 105 ! #  define SIG_ERR     ((RETSIGTYPE (*)())-1)
 106 ! # endif
 107   #endif
 108
 109   /* volatile because it is used in signal handler sig_winch(). */
 110 --- 199,205 ----
 111   #endif
 112
 113   #ifndef SIG_ERR
 114 ! # define SIG_ERR      ((RETSIGTYPE (*)())-1)
 115   #endif
 116
 117   /* volatile because it is used in signal handler sig_winch(). */
 118 ***************
 119 *** 443,451 ****
 120
 121   #if defined(HAVE_TOTAL_MEM) || defined(PROTO)
 122   # ifdef HAVE_SYS_RESOURCE_H
 123 ! #  ifndef S_SPLINT_S  /* splint crashes on bits/resource.h */
 124 ! #   include <sys/resource.h>
 125 ! #  endif
 126   # endif
 127   # if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_SYSCTL)
 128   #  include <sys/sysctl.h>
 129 --- 441,447 ----
 130
 131   #if defined(HAVE_TOTAL_MEM) || defined(PROTO)
 132   # ifdef HAVE_SYS_RESOURCE_H
 133 ! #  include <sys/resource.h>
 134   # endif
 135   # if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_SYSCTL)
 136   #  include <sys/sysctl.h>
 137 *** ../vim-7.2.175/src/os_unix.h        2009-05-15 21:31:11.000000000 +0200
 138 --- src/os_unix.h       2009-05-16 16:17:22.000000000 +0200
 139 ***************
 140 *** 53,61 ****
 141   #endif
 142
 143   #ifdef HAVE_UNISTD_H
 144 ! # ifndef S_SPLINT_S  /* splint crashes on bits/confname.h */
 145 ! #  include <unistd.h>
 146 ! # endif
 147   #endif
 148
 149   #ifdef HAVE_LIBC_H
 150 --- 53,59 ----
 151   #endif
 152
 153   #ifdef HAVE_UNISTD_H
 154 ! # include <unistd.h>
 155   #endif
 156
 157   #ifdef HAVE_LIBC_H
 158 *** ../vim-7.2.175/src/structs.h        2009-05-13 20:47:07.000000000 +0200
 159 --- src/structs.h       2009-05-16 16:17:51.000000000 +0200
 160 ***************
 161 *** 1646,1656 ****
 162   #endif
 163   #ifdef FEAT_DIFF
 164       diff_T        *tp_first_diff;
 165 - # ifdef S_SPLINT_S  /* splint doesn't understand the array of pointers */
 166 -     buf_T         **tp_diffbuf;
 167 - # else
 168       buf_T         *(tp_diffbuf[DB_COUNT]);
 169 - # endif
 170       int                   tp_diff_invalid;    /* list of diffs is outdated */
 171   #endif
 172       frame_T       *tp_snapshot;    /* window layout snapshot */
 173 --- 1646,1652 ----
 174 *** ../vim-7.2.175/src/term.h   2009-05-13 18:54:14.000000000 +0200
 175 --- src/term.h  2009-05-16 16:20:06.000000000 +0200
 176 ***************
 177 *** 96,106 ****
 178    * - there should be code in term.c to obtain the value from the termcap
 179    */
 180
 181 - #ifdef S_SPLINT_S  /* splint doesn't understand array of pointers */
 182 - extern char_u **term_strings;    /* current terminal strings */
 183 - #else
 184   extern char_u *(term_strings[]);    /* current terminal strings */
 185 - #endif
 186
 187   /*
 188    * strings used for terminal
 189 --- 96,102 ----
 190 *** ../vim-7.2.175/src/version.c        2009-05-16 16:15:39.000000000 +0200
 191 --- src/version.c       2009-05-16 16:34:10.000000000 +0200
 192 ***************
 193 *** 678,679 ****
 194 --- 678,681 ----
 195   {   /* Add new patch number below this line */
 196 + /**/
 197 +     176,
 198   /**/
 199
 200 --
 201 Corn oil comes from corn and olive oil comes from olives, so where
 202 does baby oil come from?
 203
 204  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 205 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 206 \\\        download, build and distribute -- http://www.A-A-P.org        ///
 207  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///