1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
|
To: vim-dev@vim.org
Subject: Patch 7.2.333
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.2.333
Problem: Warnings from static code analysis.
Solution: Small changes to various lines. (Dominique Pelle)
Files: src/buffer.c, src/edit.c, src/ex_getln.c, src/fileio.c,
src/if_cscope.c, src/netbeans.c, src/ops.c, src/quickfix.c,
src/syntax.c, src/ui.c
*** ../vim-7.2.332/src/buffer.c 2009-05-17 13:30:58.000000000 +0200
--- src/buffer.c 2010-01-19 12:50:24.000000000 +0100
***************
*** 315,321 ****
{
#ifdef FEAT_AUTOCMD
int is_curbuf;
! int nwindows = buf->b_nwindows;
#endif
int unload_buf = (action != 0);
int del_buf = (action == DOBUF_DEL || action == DOBUF_WIPE);
--- 315,321 ----
{
#ifdef FEAT_AUTOCMD
int is_curbuf;
! int nwindows;
#endif
int unload_buf = (action != 0);
int del_buf = (action == DOBUF_DEL || action == DOBUF_WIPE);
*** ../vim-7.2.332/src/edit.c 2009-12-24 15:45:53.000000000 +0100
--- src/edit.c 2010-01-19 12:53:18.000000000 +0100
***************
*** 4048,4054 ****
save_p_ic = p_ic;
p_ic = ignorecase(compl_pattern);
! /* Find up to TAG_MANY matches. Avoids that an enourmous number
* of matches is found when compl_pattern is empty */
if (find_tags(compl_pattern, &num_matches, &matches,
TAG_REGEXP | TAG_NAMES | TAG_NOIC |
--- 4048,4054 ----
save_p_ic = p_ic;
p_ic = ignorecase(compl_pattern);
! /* Find up to TAG_MANY matches. Avoids that an enormous number
* of matches is found when compl_pattern is empty */
if (find_tags(compl_pattern, &num_matches, &matches,
TAG_REGEXP | TAG_NAMES | TAG_NOIC |
***************
*** 4219,4225 ****
|| IObuff[len - 2] == '!'))))
IObuff[len++] = ' ';
}
! /* copy as much as posible of the new word */
if (tmp_ptr - ptr >= IOSIZE - len)
tmp_ptr = ptr + IOSIZE - len - 1;
STRNCPY(IObuff + len, ptr, tmp_ptr - ptr);
--- 4219,4225 ----
|| IObuff[len - 2] == '!'))))
IObuff[len++] = ' ';
}
! /* copy as much as possible of the new word */
if (tmp_ptr - ptr >= IOSIZE - len)
tmp_ptr = ptr + IOSIZE - len - 1;
STRNCPY(IObuff + len, ptr, tmp_ptr - ptr);
***************
*** 5827,5836 ****
#endif
&& !has_format_option(FO_WRAP))
- {
- textwidth = 0;
break;
- }
if ((startcol = curwin->w_cursor.col) == 0)
break;
--- 5827,5833 ----
*** ../vim-7.2.332/src/ex_getln.c 2009-12-02 17:15:04.000000000 +0100
--- src/ex_getln.c 2010-01-19 12:54:47.000000000 +0100
***************
*** 2193,2199 ****
{
if (ga_grow(&line_ga, 40) == FAIL)
break;
- pend = (char_u *)line_ga.ga_data + line_ga.ga_len;
/* Get one character at a time. Don't use inchar(), it can't handle
* special characters. */
--- 2193,2198 ----
***************
*** 3314,3320 ****
WILD_HOME_REPLACE|WILD_ADD_SLASH|WILD_SILENT|WILD_ESCAPE
|options, type);
vim_free(p1);
! /* longest match: make sure it is not shorter (happens with :help */
if (p2 != NULL && type == WILD_LONGEST)
{
for (j = 0; j < xp->xp_pattern_len; ++j)
--- 3313,3319 ----
WILD_HOME_REPLACE|WILD_ADD_SLASH|WILD_SILENT|WILD_ESCAPE
|options, type);
vim_free(p1);
! /* longest match: make sure it is not shorter, happens with :help */
if (p2 != NULL && type == WILD_LONGEST)
{
for (j = 0; j < xp->xp_pattern_len; ++j)
*** ../vim-7.2.332/src/fileio.c 2009-12-31 14:52:48.000000000 +0100
--- src/fileio.c 2010-01-19 12:56:59.000000000 +0100
***************
*** 7072,7079 ****
*/
for (i = 0; i < (int)(sizeof(tempdirs) / sizeof(char *)); ++i)
{
- size_t itmplen;
# ifndef HAVE_MKDTEMP
long nr;
long off;
# endif
--- 7072,7079 ----
*/
for (i = 0; i < (int)(sizeof(tempdirs) / sizeof(char *)); ++i)
{
# ifndef HAVE_MKDTEMP
+ size_t itmplen;
long nr;
long off;
# endif
***************
*** 7091,7097 ****
else
# endif
add_pathsep(itmp);
- itmplen = STRLEN(itmp);
# ifdef HAVE_MKDTEMP
/* Leave room for filename */
--- 7091,7096 ----
***************
*** 7104,7109 ****
--- 7103,7109 ----
* otherwise it doesn't matter. The use of mkdir() avoids any
* security problems because of the predictable number. */
nr = (mch_get_pid() + (long)time(NULL)) % 1000000L;
+ itmplen = STRLEN(itmp);
/* Try up to 10000 different values until we find a name that
* doesn't exist. */
*** ../vim-7.2.332/src/if_cscope.c 2009-07-09 21:22:36.000000000 +0200
--- src/if_cscope.c 2010-01-19 12:57:58.000000000 +0100
***************
*** 2069,2075 ****
continue;
(void)strcpy(tbuf, matches[idx]);
! if ((fname = strtok(tbuf, (const char *)"\t")) == NULL)
continue;
if ((fname = strtok(NULL, (const char *)"\t")) == NULL)
continue;
--- 2069,2075 ----
continue;
(void)strcpy(tbuf, matches[idx]);
! if (strtok(tbuf, (const char *)"\t") == NULL)
continue;
if ((fname = strtok(NULL, (const char *)"\t")) == NULL)
continue;
*** ../vim-7.2.332/src/netbeans.c 2009-09-11 14:19:41.000000000 +0200
--- src/netbeans.c 2010-01-19 13:57:11.000000000 +0100
***************
*** 873,879 ****
{
#ifdef NBDEBUG
/*
! * This happens because the ExtEd can send a cammand or 2 after
* doing a stopDocumentListen command. It doesn't harm anything
* so I'm disabling it except for debugging.
*/
--- 883,889 ----
{
#ifdef NBDEBUG
/*
! * This happens because the ExtEd can send a command or 2 after
* doing a stopDocumentListen command. It doesn't harm anything
* so I'm disabling it except for debugging.
*/
***************
*** 1174,1180 ****
break;
}
}
! *q++ = '\0';
return buf;
}
--- 1184,1190 ----
break;
}
}
! *q = '\0';
return buf;
}
***************
*** 3070,3076 ****
}
/*
! * Send netbeans an unmodufied command.
*/
void
netbeans_unmodified(buf_T *bufp UNUSED)
--- 3080,3086 ----
}
/*
! * Send netbeans an unmodified command.
*/
void
netbeans_unmodified(buf_T *bufp UNUSED)
***************
*** 3366,3372 ****
/*
! * Add a sign of the reqested type at the requested location.
*
* Reverse engineering:
* Apparently an annotation is defined the first time it is used in a buffer.
--- 3380,3386 ----
/*
! * Add a sign of the requested type at the requested location.
*
* Reverse engineering:
* Apparently an annotation is defined the first time it is used in a buffer.
*** ../vim-7.2.332/src/ops.c 2009-11-25 12:38:49.000000000 +0100
--- src/ops.c 2010-01-19 13:04:46.000000000 +0100
***************
*** 5591,5603 ****
*/
if (has_mbyte)
{
- char_u *conv_str = str;
vimconv_T vc;
vc.vc_type = CONV_NONE;
if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK)
{
! int intlen = len;
conv_str = string_convert(&vc, str, &intlen);
len = intlen;
--- 5598,5610 ----
*/
if (has_mbyte)
{
vimconv_T vc;
vc.vc_type = CONV_NONE;
if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK)
{
! int intlen = len;
! char_u *conv_str;
conv_str = string_convert(&vc, str, &intlen);
len = intlen;
*** ../vim-7.2.332/src/quickfix.c 2009-06-24 17:31:27.000000000 +0200
--- src/quickfix.c 2010-01-19 13:12:29.000000000 +0100
***************
*** 1899,1905 ****
int i;
int idx1 = 1;
int idx2 = -1;
- int need_return = TRUE;
char_u *arg = eap->arg;
int all = eap->forceit; /* if not :cl!, only show
recognised errors */
--- 1899,1904 ----
***************
*** 1939,1951 ****
{
if ((qfp->qf_valid || all) && idx1 <= i && i <= idx2)
{
! if (need_return)
! {
! msg_putchar('\n');
! if (got_int)
! break;
! need_return = FALSE;
! }
fname = NULL;
if (qfp->qf_fnum != 0
--- 1938,1946 ----
{
if ((qfp->qf_valid || all) && idx1 <= i && i <= idx2)
{
! msg_putchar('\n');
! if (got_int)
! break;
fname = NULL;
if (qfp->qf_fnum != 0
***************
*** 1988,1994 ****
IObuff, IOSIZE);
msg_prt_line(IObuff, FALSE);
out_flush(); /* show one line at a time */
- need_return = TRUE;
}
qfp = qfp->qf_next;
--- 1983,1988 ----
*** ../vim-7.2.332/src/syntax.c 2009-12-16 18:13:04.000000000 +0100
--- src/syntax.c 2010-01-19 13:12:56.000000000 +0100
***************
*** 4167,4173 ****
if (!HASHITEM_EMPTY(hi))
{
--todo;
- kp = HI2KE(hi);
for (kp = HI2KE(hi); kp != NULL; kp = kp_next)
{
kp_next = kp->ke_next;
--- 4167,4172 ----
*** ../vim-7.2.332/src/ui.c 2009-09-11 16:48:06.000000000 +0200
--- src/ui.c 2010-01-19 13:14:04.000000000 +0100
***************
*** 2383,2389 ****
* 'enc' anyway. */
if (has_mbyte)
{
! char_u *conv_buf = buffer;
vimconv_T vc;
vc.vc_type = CONV_NONE;
--- 2383,2389 ----
* 'enc' anyway. */
if (has_mbyte)
{
! char_u *conv_buf;
vimconv_T vc;
vc.vc_type = CONV_NONE;
*** ../vim-7.2.332/src/version.c 2010-01-19 13:06:42.000000000 +0100
--- src/version.c 2010-01-19 14:55:50.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
{ /* Add new patch number below this line */
+ /**/
+ 333,
/**/
--
An actual excerpt from a classified section of a city newspaper:
"Illiterate? Write today for free help!"
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ download, build and distribute -- http://www.A-A-P.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
