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.929 < prev    next >
Encoding:
Internet Message Format  |  2013-05-05  |  4.2 KB
  1. To: vim_dev@googlegroups.com
  2. Subject: Patch 7.3.929
  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.929 (after 7.3.924)
  11. Problem:    Compiler warning for unused variable. Not freeing unused string.
  12. Solution:   Remove the variable. Clear the options.
  13. Files:      src/option.c
  14.  
  15.  
  16. *** ../vim-7.3.928/src/option.c    2013-05-06 03:52:44.000000000 +0200
  17. --- src/option.c    2013-05-06 06:42:03.000000000 +0200
  18. ***************
  19. *** 9705,9713 ****
  20.   {
  21.       struct vimoption *p;
  22.       int        opt_idx;
  23. ! 
  24. !     buf_T *buf = (buf_T *) from;
  25. !     win_T *win = (win_T *) from;
  26.   
  27.       opt_idx = findoption(name);
  28.       p = &(options[opt_idx]);
  29. --- 9705,9711 ----
  30.   {
  31.       struct vimoption *p;
  32.       int        opt_idx;
  33. !     buf_T    *buf = (buf_T *)from;
  34.   
  35.       opt_idx = findoption(name);
  36.       p = &(options[opt_idx]);
  37. ***************
  38. *** 9716,9775 ****
  39.       {
  40.       /* global option with local value: use local value if it's been set */
  41.       case PV_EP:
  42. !         *buf->b_p_ep = NUL;
  43.           break;
  44.       case PV_KP:
  45. !         *buf->b_p_kp = NUL;
  46.           break;
  47.       case PV_PATH:
  48. !         *buf->b_p_path = NUL;
  49.           break;
  50.       case PV_AR:
  51.           buf->b_p_ar = -1;
  52.           break;
  53.       case PV_TAGS:
  54. !         *buf->b_p_tags = NUL;
  55.           break;
  56.   #ifdef FEAT_FIND_ID
  57.       case PV_DEF:
  58. !         *buf->b_p_def = NUL;
  59.           break;
  60.       case PV_INC:
  61. !         *buf->b_p_inc = NUL;
  62.           break;
  63.   #endif
  64.   #ifdef FEAT_INS_EXPAND
  65.       case PV_DICT:
  66. !         *buf->b_p_dict = NUL;
  67.           break;
  68.       case PV_TSR:
  69. !         *buf->b_p_tsr = NUL;
  70.           break;
  71.   #endif
  72.   #ifdef FEAT_QUICKFIX
  73.       case PV_EFM:
  74. !         *buf->b_p_efm = NUL;
  75.           break;
  76.       case PV_GP:
  77. !         *buf->b_p_gp = NUL;
  78.           break;
  79.       case PV_MP:
  80. !         *buf->b_p_mp = NUL;
  81.           break;
  82.   #endif
  83.   #if defined(FEAT_BEVAL) && defined(FEAT_EVAL)
  84.       case PV_BEXPR:
  85. !         *buf->b_p_bexpr = NUL;
  86.           break;
  87.   #endif
  88.   #if defined(FEAT_CRYPT)
  89.       case PV_CM:
  90. !         *buf->b_p_cm = NUL;
  91.           break;
  92.   #endif
  93.   #ifdef FEAT_STL_OPT
  94.       case PV_STL:
  95. !         *win->w_p_stl = NUL;
  96.           break;
  97.   #endif
  98.       }
  99. --- 9714,9773 ----
  100.       {
  101.       /* global option with local value: use local value if it's been set */
  102.       case PV_EP:
  103. !         clear_string_option(&buf->b_p_ep);
  104.           break;
  105.       case PV_KP:
  106. !         clear_string_option(&buf->b_p_kp);
  107.           break;
  108.       case PV_PATH:
  109. !         clear_string_option(&buf->b_p_path);
  110.           break;
  111.       case PV_AR:
  112.           buf->b_p_ar = -1;
  113.           break;
  114.       case PV_TAGS:
  115. !         clear_string_option(&buf->b_p_tags);
  116.           break;
  117.   #ifdef FEAT_FIND_ID
  118.       case PV_DEF:
  119. !         clear_string_option(&buf->b_p_def);
  120.           break;
  121.       case PV_INC:
  122. !         clear_string_option(&buf->b_p_inc);
  123.           break;
  124.   #endif
  125.   #ifdef FEAT_INS_EXPAND
  126.       case PV_DICT:
  127. !         clear_string_option(&buf->b_p_dict);
  128.           break;
  129.       case PV_TSR:
  130. !         clear_string_option(&buf->b_p_tsr);
  131.           break;
  132.   #endif
  133.   #ifdef FEAT_QUICKFIX
  134.       case PV_EFM:
  135. !         clear_string_option(&buf->b_p_efm);
  136.           break;
  137.       case PV_GP:
  138. !         clear_string_option(&buf->b_p_gp);
  139.           break;
  140.       case PV_MP:
  141. !         clear_string_option(&buf->b_p_mp);
  142.           break;
  143.   #endif
  144.   #if defined(FEAT_BEVAL) && defined(FEAT_EVAL)
  145.       case PV_BEXPR:
  146. !         clear_string_option(&buf->b_p_bexpr);
  147.           break;
  148.   #endif
  149.   #if defined(FEAT_CRYPT)
  150.       case PV_CM:
  151. !         clear_string_option(&buf->b_p_cm);
  152.           break;
  153.   #endif
  154.   #ifdef FEAT_STL_OPT
  155.       case PV_STL:
  156. !         clear_string_option(&((win_T *)from)->w_p_stl);
  157.           break;
  158.   #endif
  159.       }
  160. *** ../vim-7.3.928/src/version.c    2013-05-06 06:26:10.000000000 +0200
  161. --- src/version.c    2013-05-06 06:35:06.000000000 +0200
  162. ***************
  163. *** 730,731 ****
  164. --- 730,733 ----
  165.   {   /* Add new patch number below this line */
  166. + /**/
  167. +     929,
  168.   /**/
  169.  
  170. -- 
  171. Microsoft: "Windows NT 4.0 now has the same user-interface as Windows 95"
  172.     Windows 95: "Press CTRL-ALT-DEL to reboot"
  173. Windows NT 4.0: "Press CTRL-ALT-DEL to login"
  174.  
  175.  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  176. ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  177. \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  178.  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
  179.