projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 5a088057 KK |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.732 | |
| 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.732 | |
| 11 | Problem: Compiler warnings for function arguments. | |
| 12 | Solution: Use inteptr_t instead of long. | |
| 13 | Files: src/if_mzsch.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.3.731/src/if_mzsch.c 2012-10-14 03:41:54.000000000 +0200 | |
| 17 | --- src/if_mzsch.c 2012-11-24 14:00:31.000000000 +0100 | |
| 18 | *************** | |
| 19 | *** 142,148 **** | |
| 20 | static int do_mzscheme_command(exarg_T *, void *, Scheme_Closed_Prim *what); | |
| 21 | static void startup_mzscheme(void); | |
| 22 | static char *string_to_line(Scheme_Object *obj); | |
| 23 | ! static void do_output(char *mesg, long len); | |
| 24 | static void do_printf(char *format, ...); | |
| 25 | static void do_flush(void); | |
| 26 | static Scheme_Object *_apply_thunk_catch_exceptions( | |
| 27 | --- 142,148 ---- | |
| 28 | static int do_mzscheme_command(exarg_T *, void *, Scheme_Closed_Prim *what); | |
| 29 | static void startup_mzscheme(void); | |
| 30 | static char *string_to_line(Scheme_Object *obj); | |
| 31 | ! static void do_output(char *mesg, intptr_t len); | |
| 32 | static void do_printf(char *format, ...); | |
| 33 | static void do_flush(void); | |
| 34 | static Scheme_Object *_apply_thunk_catch_exceptions( | |
| 35 | *************** | |
| 36 | *** 1349,1356 **** | |
| 37 | } | |
| 38 | ||
| 39 | static void | |
| 40 | ! do_output(char *mesg, long len UNUSED) | |
| 41 | { | |
| 42 | do_intrnl_output(mesg, 0); | |
| 43 | } | |
| 44 | ||
| 45 | --- 1349,1357 ---- | |
| 46 | } | |
| 47 | ||
| 48 | static void | |
| 49 | ! do_output(char *mesg, intptr_t len UNUSED) | |
| 50 | { | |
| 51 | + /* TODO: use len, the string may not be NUL terminated */ | |
| 52 | do_intrnl_output(mesg, 0); | |
| 53 | } | |
| 54 | ||
| 55 | *************** | |
| 56 | *** 1370,1376 **** | |
| 57 | do_flush(void) | |
| 58 | { | |
| 59 | char *buff; | |
| 60 | ! long length; | |
| 61 | ||
| 62 | buff = scheme_get_sized_string_output(curerr, &length); | |
| 63 | MZ_GC_CHECK(); | |
| 64 | --- 1371,1377 ---- | |
| 65 | do_flush(void) | |
| 66 | { | |
| 67 | char *buff; | |
| 68 | ! intptr_t length; | |
| 69 | ||
| 70 | buff = scheme_get_sized_string_output(curerr, &length); | |
| 71 | MZ_GC_CHECK(); | |
| 72 | *************** | |
| 73 | *** 2588,2594 **** | |
| 74 | { | |
| 75 | char *scheme_str = NULL; | |
| 76 | char *vim_str = NULL; | |
| 77 | ! long len; | |
| 78 | int i; | |
| 79 | ||
| 80 | scheme_str = scheme_display_to_string(obj, &len); | |
| 81 | --- 2589,2595 ---- | |
| 82 | { | |
| 83 | char *scheme_str = NULL; | |
| 84 | char *vim_str = NULL; | |
| 85 | ! intptr_t len; | |
| 86 | int i; | |
| 87 | ||
| 88 | scheme_str = scheme_display_to_string(obj, &len); | |
| 89 | *************** | |
| 90 | *** 2597,2606 **** | |
| 91 | * are replacing a single line, and we must replace it with | |
| 92 | * a single line. | |
| 93 | */ | |
| 94 | ! if (memchr(scheme_str, '\n', len)) | |
| 95 | scheme_signal_error(_("string cannot contain newlines")); | |
| 96 | ||
| 97 | ! vim_str = (char *)alloc(len + 1); | |
| 98 | ||
| 99 | /* Create a copy of the string, with internal nulls replaced by | |
| 100 | * newline characters, as is the vim convention. | |
| 101 | --- 2598,2607 ---- | |
| 102 | * are replacing a single line, and we must replace it with | |
| 103 | * a single line. | |
| 104 | */ | |
| 105 | ! if (memchr(scheme_str, '\n', (size_t)len)) | |
| 106 | scheme_signal_error(_("string cannot contain newlines")); | |
| 107 | ||
| 108 | ! vim_str = (char *)alloc((int)(len + 1)); | |
| 109 | ||
| 110 | /* Create a copy of the string, with internal nulls replaced by | |
| 111 | * newline characters, as is the vim convention. | |
| 112 | *** ../vim-7.3.731/src/version.c 2012-11-28 15:33:10.000000000 +0100 | |
| 113 | --- src/version.c 2012-11-28 15:34:30.000000000 +0100 | |
| 114 | *************** | |
| 115 | *** 727,728 **** | |
| 116 | --- 727,730 ---- | |
| 117 | { /* Add new patch number below this line */ | |
| 118 | + /**/ | |
| 119 | + 732, | |
| 120 | /**/ | |
| 121 | ||
| 122 | -- | |
| 123 | hundred-and-one symptoms of being an internet addict: | |
| 124 | 91. It's Saturday afternoon in the middle of May and you | |
| 125 | are on computer. | |
| 126 | ||
| 127 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 128 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 129 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 130 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |