vim/patches/vim-7.3.037.patch0

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.037
   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.3.037
  11 Problem:    Compiler warnings for loss of data. (Mike Williams)
  12 Solution:   Add type casts.
  13 Files:      src/if_py_both.h, src/getchar.c, src/os_win32.c
  14
  15
  16 *** ../vim-7.3.036/src/if_py_both.h     2010-09-21 16:49:29.000000000 +0200
  17 --- src/if_py_both.h    2010-10-25 20:37:07.000000000 +0200
  18 ***************
  19 *** 154,160 ****
  20       {
  21         PyInt len = ptr - str;
  22
  23 !       if (ga_grow(&io_ga, len + 1) == FAIL)
  24             break;
  25
  26         mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)len);
  27 --- 154,160 ----
  28       {
  29         PyInt len = ptr - str;
  30
  31 !       if (ga_grow(&io_ga, (int)(len + 1)) == FAIL)
  32             break;
  33
  34         mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)len);
  35 ***************
  36 *** 166,175 ****
  37       }
  38
  39       /* Put the remaining text into io_ga for later printing. */
  40 !     if (n > 0 && ga_grow(&io_ga, n + 1) == OK)
  41       {
  42         mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)n);
  43 !       io_ga.ga_len += n;
  44       }
  45   }
  46
  47 --- 166,175 ----
  48       }
  49
  50       /* Put the remaining text into io_ga for later printing. */
  51 !     if (n > 0 && ga_grow(&io_ga, (int)(n + 1)) == OK)
  52       {
  53         mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)n);
  54 !       io_ga.ga_len += (int)n;
  55       }
  56   }
  57
  58 *** ../vim-7.3.036/src/getchar.c        2010-10-22 22:13:47.000000000 +0200
  59 --- src/getchar.c       2010-10-25 20:39:31.000000000 +0200
  60 ***************
  61 *** 3922,3928 ****
  62       if (mapchars != NULL)
  63       {
  64         msg_puts(mapchars);
  65 !       len = STRLEN(mapchars);
  66         vim_free(mapchars);
  67       }
  68
  69 --- 3922,3928 ----
  70       if (mapchars != NULL)
  71       {
  72         msg_puts(mapchars);
  73 !       len = (int)STRLEN(mapchars);
  74         vim_free(mapchars);
  75       }
  76
  77 *** ../vim-7.3.036/src/os_win32.c       2010-10-24 14:33:38.000000000 +0200
  78 --- src/os_win32.c      2010-10-25 20:38:49.000000000 +0200
  79 ***************
  80 *** 224,230 ****
  81
  82       if (exe_path == NULL && exe_name != NULL)
  83       {
  84 !       exe_path = vim_strnsave(exe_name, gettail_sep(exe_name) - exe_name);
  85         if (exe_path != NULL)
  86         {
  87             /* Append our starting directory to $PATH, so that when doing
  88 --- 224,231 ----
  89
  90       if (exe_path == NULL && exe_name != NULL)
  91       {
  92 !       exe_path = vim_strnsave(exe_name,
  93 !                                    (int)(gettail_sep(exe_name) - exe_name));
  94         if (exe_path != NULL)
  95         {
  96             /* Append our starting directory to $PATH, so that when doing
  97 ***************
  98 *** 2374,2380 ****
  99         /* To avoid a slow failure append "\*" when searching a directory,
 100          * server or network share. */
 101         STRCPY(szTrueNameTemp, szTrueName);
 102 !       slen = strlen(szTrueNameTemp);
 103         if (*porig == psepc && slen + 2 < _MAX_PATH)
 104             STRCPY(szTrueNameTemp + slen, "\\*");
 105
 106 --- 2375,2381 ----
 107         /* To avoid a slow failure append "\*" when searching a directory,
 108          * server or network share. */
 109         STRCPY(szTrueNameTemp, szTrueName);
 110 !       slen = (int)strlen(szTrueNameTemp);
 111         if (*porig == psepc && slen + 2 < _MAX_PATH)
 112             STRCPY(szTrueNameTemp + slen, "\\*");
 113
 114 *** ../vim-7.3.036/src/version.c        2010-10-27 12:15:28.000000000 +0200
 115 --- src/version.c       2010-10-27 12:16:53.000000000 +0200
 116 ***************
 117 *** 716,717 ****
 118 --- 716,719 ----
 119   {   /* Add new patch number below this line */
 120 + /**/
 121 +     37,
 122   /**/
 123
 124 --
 125 ARTHUR:  You fight with the strength of many men, Sir knight.
 126          I am Arthur, King of the Britons.  [pause]
 127          I seek the finest and the bravest knights in the land to join me
 128          in my Court of Camelot.  [pause]
 129          You have proved yourself worthy; will you join me?  [pause]
 130          You make me sad.  So be it.  Come, Patsy.
 131 BLACK KNIGHT:  None shall pass.
 132                                   The Quest for the Holy Grail (Monty Python)
 133
 134  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 135 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 136 \\\        download, build and distribute -- http://www.A-A-P.org        ///
 137  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///