home *** CD-ROM | disk | FTP | other *** search
/ vim.ftp.fu-berlin.de / 2015-02-03.vim.ftp.fu-berlin.de.tar / vim.ftp.fu-berlin.de / patches / 7.3 / 7.3.1305 < prev    next >
Encoding:
Internet Message Format  |  2013-07-03  |  2.9 KB
  1. To: vim_dev@googlegroups.com
  2. Subject: Patch 7.3.1305
  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.1305
  11. Problem:    Warnings from 64 bit compiler.
  12. Solution:   Add type casts.
  13. Files:        src/misc2.c
  14.  
  15.  
  16. *** ../vim-7.3.1304/src/misc2.c    2013-07-03 21:19:00.000000000 +0200
  17. --- src/misc2.c    2013-07-04 21:14:48.000000000 +0200
  18. ***************
  19. *** 4680,4687 ****
  20.       STRCPY(ff_expand_buffer, search_ctx->ffsc_start_dir);
  21.       add_pathsep(ff_expand_buffer);
  22.       {
  23. !     int    eb_len = STRLEN(ff_expand_buffer);
  24. !     char_u *buf = alloc(eb_len + STRLEN(search_ctx->ffsc_fix_path) + 1);
  25.   
  26.       STRCPY(buf, ff_expand_buffer);
  27.       STRCPY(buf + eb_len, search_ctx->ffsc_fix_path);
  28. --- 4680,4688 ----
  29.       STRCPY(ff_expand_buffer, search_ctx->ffsc_start_dir);
  30.       add_pathsep(ff_expand_buffer);
  31.       {
  32. !     int    eb_len = (int)STRLEN(ff_expand_buffer);
  33. !     char_u *buf = alloc(eb_len
  34. !                 + (int)STRLEN(search_ctx->ffsc_fix_path) + 1);
  35.   
  36.       STRCPY(buf, ff_expand_buffer);
  37.       STRCPY(buf + eb_len, search_ctx->ffsc_fix_path);
  38. ***************
  39. *** 4700,4717 ****
  40.   
  41.           if (p > search_ctx->ffsc_fix_path)
  42.           {
  43. !         len = p - search_ctx->ffsc_fix_path - 1;
  44.           STRNCAT(ff_expand_buffer, search_ctx->ffsc_fix_path, len);
  45.           add_pathsep(ff_expand_buffer);
  46.           }
  47.           else
  48. !         len = STRLEN(search_ctx->ffsc_fix_path);
  49.   
  50.           if (search_ctx->ffsc_wc_path != NULL)
  51.           {
  52.           wc_path = vim_strsave(search_ctx->ffsc_wc_path);
  53. !         temp = alloc(STRLEN(search_ctx->ffsc_wc_path)
  54. !                  + (STRLEN(search_ctx->ffsc_fix_path) - len));
  55.           }
  56.   
  57.           if (temp == NULL || wc_path == NULL)
  58. --- 4701,4718 ----
  59.   
  60.           if (p > search_ctx->ffsc_fix_path)
  61.           {
  62. !         len = (int)(p - search_ctx->ffsc_fix_path) - 1;
  63.           STRNCAT(ff_expand_buffer, search_ctx->ffsc_fix_path, len);
  64.           add_pathsep(ff_expand_buffer);
  65.           }
  66.           else
  67. !         len = (int)STRLEN(search_ctx->ffsc_fix_path);
  68.   
  69.           if (search_ctx->ffsc_wc_path != NULL)
  70.           {
  71.           wc_path = vim_strsave(search_ctx->ffsc_wc_path);
  72. !         temp = alloc((int)(STRLEN(search_ctx->ffsc_wc_path)
  73. !                  + (STRLEN(search_ctx->ffsc_fix_path)) - len));
  74.           }
  75.   
  76.           if (temp == NULL || wc_path == NULL)
  77. *** ../vim-7.3.1304/src/version.c    2013-07-04 20:50:42.000000000 +0200
  78. --- src/version.c    2013-07-04 21:13:23.000000000 +0200
  79. ***************
  80. *** 730,731 ****
  81. --- 730,733 ----
  82.   {   /* Add new patch number below this line */
  83. + /**/
  84. +     1305,
  85.   /**/
  86.  
  87. -- 
  88. A hamburger walks into a bar, and the bartender says: "I'm sorry,
  89. but we don't serve food here."
  90.  
  91.  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  92. ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  93. \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  94.  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
  95.