Merge lp:~ralph-lange/epics-base/fix-cpp-keywords into lp:~epics-core/epics-base/3.14
- fix-cpp-keywords
- Merge into 3.14
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Andrew Johnson | ||||||||
Approved revision: | 12072 | ||||||||
Merged at revision: | 12071 | ||||||||
Proposed branch: | lp:~ralph-lange/epics-base/fix-cpp-keywords | ||||||||
Merge into: | lp:~epics-core/epics-base/3.14 | ||||||||
Diff against target: |
868 lines (+232/-231) 3 files modified
src/db/db_access.c (+199/-199) src/dbStatic/dbStaticLib.c (+5/-5) src/libCom/osi/os/WIN32/osdProcess.c (+28/-27) |
||||||||
To merge this branch: | bzr merge lp:~ralph-lange/epics-base/fix-cpp-keywords | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrew Johnson | Approve | ||
Review via email: mp+27760@code.launchpad.net |
Commit message
Description of the change
Replaced the C++ reserved word new where it was used as a variable name.
Replaced C++ "//" style comments with standard C comments where they were used in C code.
Nick Rees (nick-rees) wrote : | # |
Andrew Johnson (anj) wrote : | # |
Agreed, go ahead and merge this immediately.
Ralph Lange (ralph-lange) wrote : | # |
Done.
On Mon 21 Jun 2010 16:35:31 Andrew Johnson wrote:
> Review: Approve
> Agreed, go ahead and merge this immediately.
>
Michael Abbott (michael-araneidae) wrote : | # |
On Wed, 16 Jun 2010, Ralph Lange wrote:
> Ralph Lange has proposed merging
> lp:~ralph-lange/epics-base/fix-cpp-keywords into lp:epics-base.
>
> Requested reviews:
> EPICS Core Developers (epics-core)
> Related bugs:
> #595240 C code uses C++ keywords as variable names
> https:/
> #595242 C code uses C++ "//" style comments
> https:/
>
>
> Replaced the C++ reserved word new where it was used as a variable name.
> Replaced C++ "//" style comments with standard C comments where they
> were used in C code.
Unfortunately this commit collides with
https:/
which is pending review.
Ralph Lange (ralph-lange) wrote : | # |
Sorry!
Andrew told me to go ahead and do the merge, which I did before I got
your mail.
Ralph
Andrew Johnson (anj) wrote : | # |
Sorry Michael, but your dynamic-array branch collides with at least one of my branches anyway...
I think this is just something that we'll have to get used to resolving at merge time, although I don't expect it to happen too often. There is a Bazaar plug-in that provides a rebase command if you want to take a crack at that, but I don't expect this to be hard to fix when merging your code in, so don't feel that you have to worry about it.
Preview Diff
1 | === modified file 'src/db/db_access.c' |
2 | --- src/db/db_access.c 2009-03-10 18:51:03 +0000 |
3 | +++ src/db/db_access.c 2010-06-16 20:03:31 +0000 |
4 | @@ -246,15 +246,15 @@ |
5 | struct dbr_sts_string *pold = (struct dbr_sts_string *)pbuffer; |
6 | struct { |
7 | DBRstatus |
8 | - } new; |
9 | + } newSt; |
10 | DBSTRING *pvalue = (DBSTRING *)pold->value; |
11 | |
12 | options = DBR_STATUS; |
13 | nRequest = 0; |
14 | - status = dbGetField(paddr, DBR_STRING, &new, &options, &nRequest, |
15 | + status = dbGetField(paddr, DBR_STRING, &newSt, &options, &nRequest, |
16 | pfl); |
17 | - pold->status = new.status; |
18 | - pold->severity = new.severity; |
19 | + pold->status = newSt.status; |
20 | + pold->severity = newSt.severity; |
21 | options = 0; |
22 | nRequest = no_elements; |
23 | status = dbGetField(paddr, DBR_STRING, pold->value, &options, |
24 | @@ -268,15 +268,15 @@ |
25 | struct dbr_sts_int *pold = (struct dbr_sts_int *)pbuffer; |
26 | struct { |
27 | DBRstatus |
28 | - } new; |
29 | + } newSt; |
30 | dbr_short_t *pvalue = &pold->value; |
31 | |
32 | options = DBR_STATUS; |
33 | nRequest = 0; |
34 | - status = dbGetField(paddr, DBR_SHORT, &new, &options, &nRequest, |
35 | + status = dbGetField(paddr, DBR_SHORT, &newSt, &options, &nRequest, |
36 | pfl); |
37 | - pold->status = new.status; |
38 | - pold->severity = new.severity; |
39 | + pold->status = newSt.status; |
40 | + pold->severity = newSt.severity; |
41 | options = 0; |
42 | nRequest = no_elements; |
43 | status = dbGetField(paddr, DBR_SHORT, &pold->value, &options, |
44 | @@ -289,15 +289,15 @@ |
45 | struct dbr_sts_float *pold = (struct dbr_sts_float *)pbuffer; |
46 | struct { |
47 | DBRstatus |
48 | - } new; |
49 | + } newSt; |
50 | dbr_float_t *pvalue = &pold->value; |
51 | |
52 | options = DBR_STATUS; |
53 | nRequest = 0; |
54 | - status = dbGetField(paddr, DBR_FLOAT, &new, &options, &nRequest, |
55 | + status = dbGetField(paddr, DBR_FLOAT, &newSt, &options, &nRequest, |
56 | pfl); |
57 | - pold->status = new.status; |
58 | - pold->severity = new.severity; |
59 | + pold->status = newSt.status; |
60 | + pold->severity = newSt.severity; |
61 | options = 0; |
62 | nRequest = no_elements; |
63 | status = dbGetField(paddr, DBR_FLOAT, &pold->value, &options, |
64 | @@ -310,15 +310,15 @@ |
65 | struct dbr_sts_enum *pold = (struct dbr_sts_enum *)pbuffer; |
66 | struct { |
67 | DBRstatus |
68 | - } new; |
69 | + } newSt; |
70 | dbr_enum_t *pvalue = &pold->value; |
71 | |
72 | options = DBR_STATUS; |
73 | nRequest = 0; |
74 | - status = dbGetField(paddr, DBR_ENUM, &new, &options, &nRequest, |
75 | + status = dbGetField(paddr, DBR_ENUM, &newSt, &options, &nRequest, |
76 | pfl); |
77 | - pold->status = new.status; |
78 | - pold->severity = new.severity; |
79 | + pold->status = newSt.status; |
80 | + pold->severity = newSt.severity; |
81 | options = 0; |
82 | nRequest = no_elements; |
83 | status = dbGetField(paddr, DBR_ENUM, &pold->value, &options, |
84 | @@ -331,15 +331,15 @@ |
85 | struct dbr_sts_char *pold = (struct dbr_sts_char *)pbuffer; |
86 | struct { |
87 | DBRstatus |
88 | - } new; |
89 | + } newSt; |
90 | dbr_char_t *pvalue = &pold->value; |
91 | |
92 | options = DBR_STATUS; |
93 | nRequest = 0; |
94 | - status = dbGetField(paddr, DBR_UCHAR, &new, &options, &nRequest, |
95 | + status = dbGetField(paddr, DBR_UCHAR, &newSt, &options, &nRequest, |
96 | pfl); |
97 | - pold->status = new.status; |
98 | - pold->severity = new.severity; |
99 | + pold->status = newSt.status; |
100 | + pold->severity = newSt.severity; |
101 | options = 0; |
102 | nRequest = no_elements; |
103 | status = dbGetField(paddr, DBR_UCHAR, &pold->value, &options, |
104 | @@ -352,15 +352,15 @@ |
105 | struct dbr_sts_long *pold = (struct dbr_sts_long *)pbuffer; |
106 | struct { |
107 | DBRstatus |
108 | - } new; |
109 | + } newSt; |
110 | dbr_long_t *pvalue = &pold->value; |
111 | |
112 | options = DBR_STATUS; |
113 | nRequest = 0; |
114 | - status = dbGetField(paddr, DBR_LONG, &new, &options, &nRequest, |
115 | + status = dbGetField(paddr, DBR_LONG, &newSt, &options, &nRequest, |
116 | pfl); |
117 | - pold->status = new.status; |
118 | - pold->severity = new.severity; |
119 | + pold->status = newSt.status; |
120 | + pold->severity = newSt.severity; |
121 | options = 0; |
122 | nRequest = no_elements; |
123 | status = dbGetField(paddr, DBR_LONG, &pold->value, &options, |
124 | @@ -373,15 +373,15 @@ |
125 | struct dbr_sts_double *pold = (struct dbr_sts_double *)pbuffer; |
126 | struct { |
127 | DBRstatus |
128 | - } new; |
129 | + } newSt; |
130 | dbr_double_t *pvalue = &pold->value; |
131 | |
132 | options = DBR_STATUS; |
133 | nRequest = 0; |
134 | - status = dbGetField(paddr, DBR_DOUBLE, &new, &options, &nRequest, |
135 | + status = dbGetField(paddr, DBR_DOUBLE, &newSt, &options, &nRequest, |
136 | pfl); |
137 | - pold->status = new.status; |
138 | - pold->severity = new.severity; |
139 | + pold->status = newSt.status; |
140 | + pold->severity = newSt.severity; |
141 | options = 0; |
142 | nRequest = no_elements; |
143 | status = dbGetField(paddr, DBR_DOUBLE, &pold->value, &options, |
144 | @@ -396,16 +396,16 @@ |
145 | struct { |
146 | DBRstatus |
147 | DBRtime |
148 | - } new; |
149 | + } newSt; |
150 | DBSTRING *pvalue = (DBSTRING *)(pold->value); |
151 | |
152 | options = DBR_STATUS | DBR_TIME; |
153 | nRequest = 0; |
154 | - status = dbGetField(paddr, DBR_STRING, &new, &options, &nRequest, |
155 | + status = dbGetField(paddr, DBR_STRING, &newSt, &options, &nRequest, |
156 | pfl); |
157 | - pold->status = new.status; |
158 | - pold->severity = new.severity; |
159 | - pold->stamp = new.time; /* structure copy */ |
160 | + pold->status = newSt.status; |
161 | + pold->severity = newSt.severity; |
162 | + pold->stamp = newSt.time; /* structure copy */ |
163 | options = 0; |
164 | nRequest = no_elements; |
165 | status = dbGetField(paddr, DBR_STRING, pold->value, &options, |
166 | @@ -420,16 +420,16 @@ |
167 | struct { |
168 | DBRstatus |
169 | DBRtime |
170 | - } new; |
171 | + } newSt; |
172 | dbr_short_t *pvalue = &pold->value; |
173 | |
174 | options = DBR_STATUS | DBR_TIME; |
175 | nRequest = 0; |
176 | - status = dbGetField(paddr, DBR_SHORT, &new, &options, &nRequest, |
177 | + status = dbGetField(paddr, DBR_SHORT, &newSt, &options, &nRequest, |
178 | pfl); |
179 | - pold->status = new.status; |
180 | - pold->severity = new.severity; |
181 | - pold->stamp = new.time; /* structure copy */ |
182 | + pold->status = newSt.status; |
183 | + pold->severity = newSt.severity; |
184 | + pold->stamp = newSt.time; /* structure copy */ |
185 | options = 0; |
186 | nRequest = no_elements; |
187 | status = dbGetField(paddr, DBR_SHORT, &pold->value, &options, |
188 | @@ -443,16 +443,16 @@ |
189 | struct { |
190 | DBRstatus |
191 | DBRtime |
192 | - } new; |
193 | + } newSt; |
194 | dbr_float_t *pvalue = &pold->value; |
195 | |
196 | options = DBR_STATUS | DBR_TIME; |
197 | nRequest = 0; |
198 | - status = dbGetField(paddr, DBR_FLOAT, &new, &options, &nRequest, |
199 | + status = dbGetField(paddr, DBR_FLOAT, &newSt, &options, &nRequest, |
200 | pfl); |
201 | - pold->status = new.status; |
202 | - pold->severity = new.severity; |
203 | - pold->stamp = new.time; /* structure copy */ |
204 | + pold->status = newSt.status; |
205 | + pold->severity = newSt.severity; |
206 | + pold->stamp = newSt.time; /* structure copy */ |
207 | options = 0; |
208 | nRequest = no_elements; |
209 | status = dbGetField(paddr, DBR_FLOAT, &pold->value, &options, |
210 | @@ -466,16 +466,16 @@ |
211 | struct { |
212 | DBRstatus |
213 | DBRtime |
214 | - } new; |
215 | + } newSt; |
216 | dbr_enum_t *pvalue = &pold->value; |
217 | |
218 | options = DBR_STATUS | DBR_TIME; |
219 | nRequest = 0; |
220 | - status = dbGetField(paddr, DBR_ENUM, &new, &options, &nRequest, |
221 | + status = dbGetField(paddr, DBR_ENUM, &newSt, &options, &nRequest, |
222 | pfl); |
223 | - pold->status = new.status; |
224 | - pold->severity = new.severity; |
225 | - pold->stamp = new.time; /* structure copy */ |
226 | + pold->status = newSt.status; |
227 | + pold->severity = newSt.severity; |
228 | + pold->stamp = newSt.time; /* structure copy */ |
229 | options = 0; |
230 | nRequest = no_elements; |
231 | status = dbGetField(paddr, DBR_ENUM, &pold->value, &options, |
232 | @@ -489,16 +489,16 @@ |
233 | struct { |
234 | DBRstatus |
235 | DBRtime |
236 | - } new; |
237 | + } newSt; |
238 | dbr_char_t *pvalue = &pold->value; |
239 | |
240 | options = DBR_STATUS | DBR_TIME; |
241 | nRequest = 0; |
242 | - status = dbGetField(paddr, DBR_CHAR, &new, &options, &nRequest, |
243 | + status = dbGetField(paddr, DBR_CHAR, &newSt, &options, &nRequest, |
244 | pfl); |
245 | - pold->status = new.status; |
246 | - pold->severity = new.severity; |
247 | - pold->stamp = new.time; /* structure copy */ |
248 | + pold->status = newSt.status; |
249 | + pold->severity = newSt.severity; |
250 | + pold->stamp = newSt.time; /* structure copy */ |
251 | options = 0; |
252 | nRequest = no_elements; |
253 | status = dbGetField(paddr, DBR_CHAR, &pold->value, &options, |
254 | @@ -512,16 +512,16 @@ |
255 | struct { |
256 | DBRstatus |
257 | DBRtime |
258 | - } new; |
259 | + } newSt; |
260 | dbr_long_t *pvalue = &pold->value; |
261 | |
262 | options = DBR_STATUS | DBR_TIME; |
263 | nRequest = 0; |
264 | - status = dbGetField(paddr, DBR_LONG, &new, &options, &nRequest, |
265 | + status = dbGetField(paddr, DBR_LONG, &newSt, &options, &nRequest, |
266 | pfl); |
267 | - pold->status = new.status; |
268 | - pold->severity = new.severity; |
269 | - pold->stamp = new.time; /* structure copy */ |
270 | + pold->status = newSt.status; |
271 | + pold->severity = newSt.severity; |
272 | + pold->stamp = newSt.time; /* structure copy */ |
273 | options = 0; |
274 | nRequest = no_elements; |
275 | status = dbGetField(paddr, DBR_LONG, &pold->value, &options, |
276 | @@ -535,16 +535,16 @@ |
277 | struct { |
278 | DBRstatus |
279 | DBRtime |
280 | - } new; |
281 | + } newSt; |
282 | dbr_double_t *pvalue = &pold->value; |
283 | |
284 | options = DBR_STATUS | DBR_TIME; |
285 | nRequest = 0; |
286 | - status = dbGetField(paddr, DBR_DOUBLE, &new, &options, &nRequest, |
287 | + status = dbGetField(paddr, DBR_DOUBLE, &newSt, &options, &nRequest, |
288 | pfl); |
289 | - pold->status = new.status; |
290 | - pold->severity = new.severity; |
291 | - pold->stamp = new.time; /* structure copy */ |
292 | + pold->status = newSt.status; |
293 | + pold->severity = newSt.severity; |
294 | + pold->stamp = newSt.time; /* structure copy */ |
295 | options = 0; |
296 | nRequest = no_elements; |
297 | status = dbGetField(paddr, DBR_DOUBLE, &pold->value, &options, |
298 | @@ -563,23 +563,23 @@ |
299 | DBRunits |
300 | DBRgrLong |
301 | DBRalLong |
302 | - } new; |
303 | + } newSt; |
304 | dbr_short_t *pvalue = &pold->value; |
305 | |
306 | options = DBR_STATUS | DBR_UNITS | DBR_GR_LONG | DBR_AL_LONG; |
307 | nRequest = 0; |
308 | - status = dbGetField(paddr, DBR_SHORT, &new, &options, &nRequest, |
309 | + status = dbGetField(paddr, DBR_SHORT, &newSt, &options, &nRequest, |
310 | pfl); |
311 | - pold->status = new.status; |
312 | - pold->severity = new.severity; |
313 | - strncpy(pold->units, new.units, MAX_UNITS_SIZE); |
314 | + pold->status = newSt.status; |
315 | + pold->severity = newSt.severity; |
316 | + strncpy(pold->units, newSt.units, MAX_UNITS_SIZE); |
317 | pold->units[MAX_UNITS_SIZE-1] = '\0'; |
318 | - pold->upper_disp_limit = new.upper_disp_limit; |
319 | - pold->lower_disp_limit = new.lower_disp_limit; |
320 | - pold->upper_alarm_limit = new.upper_alarm_limit; |
321 | - pold->upper_warning_limit = new.upper_warning_limit; |
322 | - pold->lower_warning_limit = new.lower_warning_limit; |
323 | - pold->lower_alarm_limit = new.lower_alarm_limit; |
324 | + pold->upper_disp_limit = newSt.upper_disp_limit; |
325 | + pold->lower_disp_limit = newSt.lower_disp_limit; |
326 | + pold->upper_alarm_limit = newSt.upper_alarm_limit; |
327 | + pold->upper_warning_limit = newSt.upper_warning_limit; |
328 | + pold->lower_warning_limit = newSt.lower_warning_limit; |
329 | + pold->lower_alarm_limit = newSt.lower_alarm_limit; |
330 | options = 0; |
331 | nRequest = no_elements; |
332 | status = dbGetField(paddr, DBR_SHORT, &pold->value, &options, |
333 | @@ -596,25 +596,25 @@ |
334 | DBRprecision |
335 | DBRgrDouble |
336 | DBRalDouble |
337 | - } new; |
338 | + } newSt; |
339 | dbr_float_t *pvalue = &pold->value; |
340 | |
341 | options = DBR_STATUS | DBR_UNITS | DBR_PRECISION | DBR_GR_DOUBLE | |
342 | DBR_AL_DOUBLE; |
343 | nRequest = 0; |
344 | - status = dbGetField(paddr, DBR_FLOAT, &new, &options, &nRequest, |
345 | + status = dbGetField(paddr, DBR_FLOAT, &newSt, &options, &nRequest, |
346 | pfl); |
347 | - pold->status = new.status; |
348 | - pold->severity = new.severity; |
349 | - pold->precision = new.precision.dp; |
350 | - strncpy(pold->units, new.units, MAX_UNITS_SIZE); |
351 | + pold->status = newSt.status; |
352 | + pold->severity = newSt.severity; |
353 | + pold->precision = newSt.precision.dp; |
354 | + strncpy(pold->units, newSt.units, MAX_UNITS_SIZE); |
355 | pold->units[MAX_UNITS_SIZE-1] = '\0'; |
356 | - pold->upper_disp_limit = epicsConvertDoubleToFloat(new.upper_disp_limit); |
357 | - pold->lower_disp_limit = epicsConvertDoubleToFloat(new.lower_disp_limit); |
358 | - pold->upper_alarm_limit = epicsConvertDoubleToFloat(new.upper_alarm_limit); |
359 | - pold->lower_alarm_limit = epicsConvertDoubleToFloat(new.lower_alarm_limit); |
360 | - pold->upper_warning_limit = epicsConvertDoubleToFloat(new.upper_warning_limit); |
361 | - pold->lower_warning_limit = epicsConvertDoubleToFloat(new.lower_warning_limit); |
362 | + pold->upper_disp_limit = epicsConvertDoubleToFloat(newSt.upper_disp_limit); |
363 | + pold->lower_disp_limit = epicsConvertDoubleToFloat(newSt.lower_disp_limit); |
364 | + pold->upper_alarm_limit = epicsConvertDoubleToFloat(newSt.upper_alarm_limit); |
365 | + pold->lower_alarm_limit = epicsConvertDoubleToFloat(newSt.lower_alarm_limit); |
366 | + pold->upper_warning_limit = epicsConvertDoubleToFloat(newSt.upper_warning_limit); |
367 | + pold->lower_warning_limit = epicsConvertDoubleToFloat(newSt.lower_warning_limit); |
368 | options = 0; |
369 | nRequest = no_elements; |
370 | status = dbGetField(paddr, DBR_FLOAT, &pold->value, &options, |
371 | @@ -631,23 +631,23 @@ |
372 | DBRunits |
373 | DBRgrLong |
374 | DBRalLong |
375 | - } new; |
376 | + } newSt; |
377 | dbr_char_t *pvalue = &pold->value; |
378 | |
379 | options = DBR_STATUS | DBR_UNITS | DBR_GR_LONG | DBR_AL_LONG; |
380 | nRequest = 0; |
381 | - status = dbGetField(paddr, DBR_UCHAR, &new, &options, &nRequest, |
382 | + status = dbGetField(paddr, DBR_UCHAR, &newSt, &options, &nRequest, |
383 | pfl); |
384 | - pold->status = new.status; |
385 | - pold->severity = new.severity; |
386 | - strncpy(pold->units, new.units, MAX_UNITS_SIZE); |
387 | + pold->status = newSt.status; |
388 | + pold->severity = newSt.severity; |
389 | + strncpy(pold->units, newSt.units, MAX_UNITS_SIZE); |
390 | pold->units[MAX_UNITS_SIZE-1] = '\0'; |
391 | - pold->upper_disp_limit = new.upper_disp_limit; |
392 | - pold->lower_disp_limit = new.lower_disp_limit; |
393 | - pold->upper_alarm_limit = new.upper_alarm_limit; |
394 | - pold->upper_warning_limit = new.upper_warning_limit; |
395 | - pold->lower_warning_limit = new.lower_warning_limit; |
396 | - pold->lower_alarm_limit = new.lower_alarm_limit; |
397 | + pold->upper_disp_limit = newSt.upper_disp_limit; |
398 | + pold->lower_disp_limit = newSt.lower_disp_limit; |
399 | + pold->upper_alarm_limit = newSt.upper_alarm_limit; |
400 | + pold->upper_warning_limit = newSt.upper_warning_limit; |
401 | + pold->lower_warning_limit = newSt.lower_warning_limit; |
402 | + pold->lower_alarm_limit = newSt.lower_alarm_limit; |
403 | options = 0; |
404 | nRequest = no_elements; |
405 | status = dbGetField(paddr, DBR_UCHAR, &pold->value, &options, |
406 | @@ -663,23 +663,23 @@ |
407 | DBRunits |
408 | DBRgrLong |
409 | DBRalLong |
410 | - } new; |
411 | + } newSt; |
412 | dbr_long_t *pvalue = &pold->value; |
413 | |
414 | options = DBR_STATUS | DBR_UNITS | DBR_GR_LONG | DBR_AL_LONG; |
415 | nRequest = 0; |
416 | - status = dbGetField(paddr, DBR_LONG, &new, &options, &nRequest, |
417 | + status = dbGetField(paddr, DBR_LONG, &newSt, &options, &nRequest, |
418 | pfl); |
419 | - pold->status = new.status; |
420 | - pold->severity = new.severity; |
421 | - strncpy(pold->units, new.units, MAX_UNITS_SIZE); |
422 | + pold->status = newSt.status; |
423 | + pold->severity = newSt.severity; |
424 | + strncpy(pold->units, newSt.units, MAX_UNITS_SIZE); |
425 | pold->units[MAX_UNITS_SIZE-1] = '\0'; |
426 | - pold->upper_disp_limit = new.upper_disp_limit; |
427 | - pold->lower_disp_limit = new.lower_disp_limit; |
428 | - pold->upper_alarm_limit = new.upper_alarm_limit; |
429 | - pold->upper_warning_limit = new.upper_warning_limit; |
430 | - pold->lower_warning_limit = new.lower_warning_limit; |
431 | - pold->lower_alarm_limit = new.lower_alarm_limit; |
432 | + pold->upper_disp_limit = newSt.upper_disp_limit; |
433 | + pold->lower_disp_limit = newSt.lower_disp_limit; |
434 | + pold->upper_alarm_limit = newSt.upper_alarm_limit; |
435 | + pold->upper_warning_limit = newSt.upper_warning_limit; |
436 | + pold->lower_warning_limit = newSt.lower_warning_limit; |
437 | + pold->lower_alarm_limit = newSt.lower_alarm_limit; |
438 | options = 0; |
439 | nRequest = no_elements; |
440 | status = dbGetField(paddr, DBR_LONG, &pold->value, &options, |
441 | @@ -696,25 +696,25 @@ |
442 | DBRprecision |
443 | DBRgrDouble |
444 | DBRalDouble |
445 | - } new; |
446 | + } newSt; |
447 | dbr_double_t *pvalue = &pold->value; |
448 | |
449 | options = DBR_STATUS | DBR_UNITS | DBR_PRECISION | DBR_GR_DOUBLE | |
450 | DBR_AL_DOUBLE; |
451 | nRequest = 0; |
452 | - status = dbGetField(paddr, DBR_DOUBLE, &new, &options, &nRequest, |
453 | + status = dbGetField(paddr, DBR_DOUBLE, &newSt, &options, &nRequest, |
454 | pfl); |
455 | - pold->status = new.status; |
456 | - pold->severity = new.severity; |
457 | - pold->precision = new.precision.dp; |
458 | - strncpy(pold->units, new.units, MAX_UNITS_SIZE); |
459 | + pold->status = newSt.status; |
460 | + pold->severity = newSt.severity; |
461 | + pold->precision = newSt.precision.dp; |
462 | + strncpy(pold->units, newSt.units, MAX_UNITS_SIZE); |
463 | pold->units[MAX_UNITS_SIZE-1] = '\0'; |
464 | - pold->upper_disp_limit = new.upper_disp_limit; |
465 | - pold->lower_disp_limit = new.lower_disp_limit; |
466 | - pold->upper_alarm_limit = new.upper_alarm_limit; |
467 | - pold->upper_warning_limit = new.upper_warning_limit; |
468 | - pold->lower_warning_limit = new.lower_warning_limit; |
469 | - pold->lower_alarm_limit = new.lower_alarm_limit; |
470 | + pold->upper_disp_limit = newSt.upper_disp_limit; |
471 | + pold->lower_disp_limit = newSt.lower_disp_limit; |
472 | + pold->upper_alarm_limit = newSt.upper_alarm_limit; |
473 | + pold->upper_warning_limit = newSt.upper_warning_limit; |
474 | + pold->lower_warning_limit = newSt.lower_warning_limit; |
475 | + pold->lower_alarm_limit = newSt.lower_alarm_limit; |
476 | options = 0; |
477 | nRequest = no_elements; |
478 | status = dbGetField(paddr, DBR_DOUBLE, &pold->value, &options, |
479 | @@ -733,26 +733,26 @@ |
480 | DBRgrLong |
481 | DBRctrlLong |
482 | DBRalLong |
483 | - } new; |
484 | + } newSt; |
485 | dbr_short_t *pvalue = &pold->value; |
486 | |
487 | options = DBR_STATUS | DBR_UNITS | DBR_GR_LONG | DBR_CTRL_LONG | |
488 | DBR_AL_LONG; |
489 | nRequest = 0; |
490 | - status = dbGetField(paddr, DBR_SHORT, &new, &options, &nRequest, |
491 | + status = dbGetField(paddr, DBR_SHORT, &newSt, &options, &nRequest, |
492 | pfl); |
493 | - pold->status = new.status; |
494 | - pold->severity = new.severity; |
495 | - strncpy(pold->units, new.units, MAX_UNITS_SIZE); |
496 | + pold->status = newSt.status; |
497 | + pold->severity = newSt.severity; |
498 | + strncpy(pold->units, newSt.units, MAX_UNITS_SIZE); |
499 | pold->units[MAX_UNITS_SIZE-1] = '\0'; |
500 | - pold->upper_disp_limit = new.upper_disp_limit; |
501 | - pold->lower_disp_limit = new.lower_disp_limit; |
502 | - pold->upper_alarm_limit = new.upper_alarm_limit; |
503 | - pold->upper_warning_limit = new.upper_warning_limit; |
504 | - pold->lower_warning_limit = new.lower_warning_limit; |
505 | - pold->lower_alarm_limit = new.lower_alarm_limit; |
506 | - pold->upper_ctrl_limit = new.upper_ctrl_limit; |
507 | - pold->lower_ctrl_limit = new.lower_ctrl_limit; |
508 | + pold->upper_disp_limit = newSt.upper_disp_limit; |
509 | + pold->lower_disp_limit = newSt.lower_disp_limit; |
510 | + pold->upper_alarm_limit = newSt.upper_alarm_limit; |
511 | + pold->upper_warning_limit = newSt.upper_warning_limit; |
512 | + pold->lower_warning_limit = newSt.lower_warning_limit; |
513 | + pold->lower_alarm_limit = newSt.lower_alarm_limit; |
514 | + pold->upper_ctrl_limit = newSt.upper_ctrl_limit; |
515 | + pold->lower_ctrl_limit = newSt.lower_ctrl_limit; |
516 | options = 0; |
517 | nRequest = no_elements; |
518 | status = dbGetField(paddr, DBR_SHORT, &pold->value, &options, |
519 | @@ -770,27 +770,27 @@ |
520 | DBRgrDouble |
521 | DBRctrlDouble |
522 | DBRalDouble |
523 | - } new; |
524 | + } newSt; |
525 | dbr_float_t *pvalue = &pold->value; |
526 | |
527 | options = DBR_STATUS | DBR_UNITS | DBR_PRECISION | DBR_GR_DOUBLE | |
528 | DBR_CTRL_DOUBLE | DBR_AL_DOUBLE; |
529 | nRequest = 0; |
530 | - status = dbGetField(paddr, DBR_FLOAT, &new, &options, &nRequest, |
531 | + status = dbGetField(paddr, DBR_FLOAT, &newSt, &options, &nRequest, |
532 | pfl); |
533 | - pold->status = new.status; |
534 | - pold->severity = new.severity; |
535 | - pold->precision = new.precision.dp; |
536 | - strncpy(pold->units, new.units, MAX_UNITS_SIZE); |
537 | + pold->status = newSt.status; |
538 | + pold->severity = newSt.severity; |
539 | + pold->precision = newSt.precision.dp; |
540 | + strncpy(pold->units, newSt.units, MAX_UNITS_SIZE); |
541 | pold->units[MAX_UNITS_SIZE-1] = '\0'; |
542 | - pold->upper_disp_limit = epicsConvertDoubleToFloat(new.upper_disp_limit); |
543 | - pold->lower_disp_limit = epicsConvertDoubleToFloat(new.lower_disp_limit); |
544 | - pold->upper_alarm_limit = epicsConvertDoubleToFloat(new.upper_alarm_limit); |
545 | - pold->lower_alarm_limit = epicsConvertDoubleToFloat(new.lower_alarm_limit); |
546 | - pold->upper_warning_limit = epicsConvertDoubleToFloat(new.upper_warning_limit); |
547 | - pold->lower_warning_limit = epicsConvertDoubleToFloat(new.lower_warning_limit); |
548 | - pold->upper_ctrl_limit = epicsConvertDoubleToFloat(new.upper_ctrl_limit); |
549 | - pold->lower_ctrl_limit = epicsConvertDoubleToFloat(new.lower_ctrl_limit); |
550 | + pold->upper_disp_limit = epicsConvertDoubleToFloat(newSt.upper_disp_limit); |
551 | + pold->lower_disp_limit = epicsConvertDoubleToFloat(newSt.lower_disp_limit); |
552 | + pold->upper_alarm_limit = epicsConvertDoubleToFloat(newSt.upper_alarm_limit); |
553 | + pold->lower_alarm_limit = epicsConvertDoubleToFloat(newSt.lower_alarm_limit); |
554 | + pold->upper_warning_limit = epicsConvertDoubleToFloat(newSt.upper_warning_limit); |
555 | + pold->lower_warning_limit = epicsConvertDoubleToFloat(newSt.lower_warning_limit); |
556 | + pold->upper_ctrl_limit = epicsConvertDoubleToFloat(newSt.upper_ctrl_limit); |
557 | + pold->lower_ctrl_limit = epicsConvertDoubleToFloat(newSt.lower_ctrl_limit); |
558 | options = 0; |
559 | nRequest = no_elements; |
560 | status = dbGetField(paddr, DBR_FLOAT, &pold->value, &options, |
561 | @@ -805,7 +805,7 @@ |
562 | struct { |
563 | DBRstatus |
564 | DBRenumStrs |
565 | - } new; |
566 | + } newSt; |
567 | short no_str; |
568 | dbr_enum_t *pvalue = &pold->value; |
569 | |
570 | @@ -813,15 +813,15 @@ |
571 | /* first get status and severity */ |
572 | options = DBR_STATUS | DBR_ENUM_STRS; |
573 | nRequest = 0; |
574 | - status = dbGetField(paddr, DBR_ENUM, &new, &options, &nRequest, |
575 | + status = dbGetField(paddr, DBR_ENUM, &newSt, &options, &nRequest, |
576 | pfl); |
577 | - pold->status = new.status; |
578 | - pold->severity = new.severity; |
579 | - no_str = new.no_str; |
580 | + pold->status = newSt.status; |
581 | + pold->severity = newSt.severity; |
582 | + no_str = newSt.no_str; |
583 | if (no_str>16) no_str=16; |
584 | pold->no_str = no_str; |
585 | for (i = 0; i < no_str; i++) |
586 | - strncpy(pold->strs[i], new.strs[i], sizeof(pold->strs[i])); |
587 | + strncpy(pold->strs[i], newSt.strs[i], sizeof(pold->strs[i])); |
588 | /*now get values*/ |
589 | options = 0; |
590 | nRequest = no_elements; |
591 | @@ -839,26 +839,26 @@ |
592 | DBRgrLong |
593 | DBRctrlLong |
594 | DBRalLong |
595 | - } new; |
596 | + } newSt; |
597 | dbr_char_t *pvalue = &pold->value; |
598 | |
599 | options = DBR_STATUS | DBR_UNITS | DBR_GR_LONG | DBR_CTRL_LONG | |
600 | DBR_AL_LONG; |
601 | nRequest = 0; |
602 | - status = dbGetField(paddr, DBR_UCHAR, &new, &options, &nRequest, |
603 | + status = dbGetField(paddr, DBR_UCHAR, &newSt, &options, &nRequest, |
604 | pfl); |
605 | - pold->status = new.status; |
606 | - pold->severity = new.severity; |
607 | - strncpy(pold->units, new.units, MAX_UNITS_SIZE); |
608 | + pold->status = newSt.status; |
609 | + pold->severity = newSt.severity; |
610 | + strncpy(pold->units, newSt.units, MAX_UNITS_SIZE); |
611 | pold->units[MAX_UNITS_SIZE-1] = '\0'; |
612 | - pold->upper_disp_limit = new.upper_disp_limit; |
613 | - pold->lower_disp_limit = new.lower_disp_limit; |
614 | - pold->upper_alarm_limit = new.upper_alarm_limit; |
615 | - pold->upper_warning_limit = new.upper_warning_limit; |
616 | - pold->lower_warning_limit = new.lower_warning_limit; |
617 | - pold->lower_alarm_limit = new.lower_alarm_limit; |
618 | - pold->upper_ctrl_limit = new.upper_ctrl_limit; |
619 | - pold->lower_ctrl_limit = new.lower_ctrl_limit; |
620 | + pold->upper_disp_limit = newSt.upper_disp_limit; |
621 | + pold->lower_disp_limit = newSt.lower_disp_limit; |
622 | + pold->upper_alarm_limit = newSt.upper_alarm_limit; |
623 | + pold->upper_warning_limit = newSt.upper_warning_limit; |
624 | + pold->lower_warning_limit = newSt.lower_warning_limit; |
625 | + pold->lower_alarm_limit = newSt.lower_alarm_limit; |
626 | + pold->upper_ctrl_limit = newSt.upper_ctrl_limit; |
627 | + pold->lower_ctrl_limit = newSt.lower_ctrl_limit; |
628 | options = 0; |
629 | nRequest = no_elements; |
630 | status = dbGetField(paddr, DBR_UCHAR, &pold->value, &options, |
631 | @@ -875,26 +875,26 @@ |
632 | DBRgrLong |
633 | DBRctrlLong |
634 | DBRalLong |
635 | - } new; |
636 | + } newSt; |
637 | dbr_long_t *pvalue = &pold->value; |
638 | |
639 | options = DBR_STATUS | DBR_UNITS | DBR_GR_LONG | DBR_CTRL_LONG | |
640 | DBR_AL_LONG; |
641 | nRequest = 0; |
642 | - status = dbGetField(paddr, DBR_LONG, &new, &options, &nRequest, |
643 | + status = dbGetField(paddr, DBR_LONG, &newSt, &options, &nRequest, |
644 | pfl); |
645 | - pold->status = new.status; |
646 | - pold->severity = new.severity; |
647 | - strncpy(pold->units, new.units, MAX_UNITS_SIZE); |
648 | + pold->status = newSt.status; |
649 | + pold->severity = newSt.severity; |
650 | + strncpy(pold->units, newSt.units, MAX_UNITS_SIZE); |
651 | pold->units[MAX_UNITS_SIZE-1] = '\0'; |
652 | - pold->upper_disp_limit = new.upper_disp_limit; |
653 | - pold->lower_disp_limit = new.lower_disp_limit; |
654 | - pold->upper_alarm_limit = new.upper_alarm_limit; |
655 | - pold->upper_warning_limit = new.upper_warning_limit; |
656 | - pold->lower_warning_limit = new.lower_warning_limit; |
657 | - pold->lower_alarm_limit = new.lower_alarm_limit; |
658 | - pold->upper_ctrl_limit = new.upper_ctrl_limit; |
659 | - pold->lower_ctrl_limit = new.lower_ctrl_limit; |
660 | + pold->upper_disp_limit = newSt.upper_disp_limit; |
661 | + pold->lower_disp_limit = newSt.lower_disp_limit; |
662 | + pold->upper_alarm_limit = newSt.upper_alarm_limit; |
663 | + pold->upper_warning_limit = newSt.upper_warning_limit; |
664 | + pold->lower_warning_limit = newSt.lower_warning_limit; |
665 | + pold->lower_alarm_limit = newSt.lower_alarm_limit; |
666 | + pold->upper_ctrl_limit = newSt.upper_ctrl_limit; |
667 | + pold->lower_ctrl_limit = newSt.lower_ctrl_limit; |
668 | options = 0; |
669 | nRequest = no_elements; |
670 | status = dbGetField(paddr, DBR_LONG, &pold->value, &options, |
671 | @@ -912,27 +912,27 @@ |
672 | DBRgrDouble |
673 | DBRctrlDouble |
674 | DBRalDouble |
675 | - } new; |
676 | + } newSt; |
677 | dbr_double_t *pvalue = &pold->value; |
678 | |
679 | options = DBR_STATUS | DBR_UNITS | DBR_PRECISION | DBR_GR_DOUBLE | |
680 | DBR_CTRL_DOUBLE | DBR_AL_DOUBLE; |
681 | nRequest = 0; |
682 | - status = dbGetField(paddr, DBR_DOUBLE, &new, &options, &nRequest, |
683 | + status = dbGetField(paddr, DBR_DOUBLE, &newSt, &options, &nRequest, |
684 | pfl); |
685 | - pold->status = new.status; |
686 | - pold->severity = new.severity; |
687 | - pold->precision = new.precision.dp; |
688 | - strncpy(pold->units, new.units, MAX_UNITS_SIZE); |
689 | + pold->status = newSt.status; |
690 | + pold->severity = newSt.severity; |
691 | + pold->precision = newSt.precision.dp; |
692 | + strncpy(pold->units, newSt.units, MAX_UNITS_SIZE); |
693 | pold->units[MAX_UNITS_SIZE-1] = '\0'; |
694 | - pold->upper_disp_limit = new.upper_disp_limit; |
695 | - pold->lower_disp_limit = new.lower_disp_limit; |
696 | - pold->upper_alarm_limit = new.upper_alarm_limit; |
697 | - pold->upper_warning_limit = new.upper_warning_limit; |
698 | - pold->lower_warning_limit = new.lower_warning_limit; |
699 | - pold->lower_alarm_limit = new.lower_alarm_limit; |
700 | - pold->upper_ctrl_limit = new.upper_ctrl_limit; |
701 | - pold->lower_ctrl_limit = new.lower_ctrl_limit; |
702 | + pold->upper_disp_limit = newSt.upper_disp_limit; |
703 | + pold->lower_disp_limit = newSt.lower_disp_limit; |
704 | + pold->upper_alarm_limit = newSt.upper_alarm_limit; |
705 | + pold->upper_warning_limit = newSt.upper_warning_limit; |
706 | + pold->lower_warning_limit = newSt.lower_warning_limit; |
707 | + pold->lower_alarm_limit = newSt.lower_alarm_limit; |
708 | + pold->upper_ctrl_limit = newSt.upper_ctrl_limit; |
709 | + pold->lower_ctrl_limit = newSt.lower_ctrl_limit; |
710 | options = 0; |
711 | nRequest = no_elements; |
712 | status = dbGetField(paddr, DBR_DOUBLE, &pold->value, &options, |
713 | @@ -946,17 +946,17 @@ |
714 | struct dbr_stsack_string *pold = (struct dbr_stsack_string *)pbuffer; |
715 | struct { |
716 | DBRstatus |
717 | - } new; |
718 | + } newSt; |
719 | DBSTRING *pvalue = (DBSTRING *)(pold->value); |
720 | |
721 | options = DBR_STATUS; |
722 | nRequest = 0; |
723 | - status = dbGetField(paddr, DBR_STRING, &new, &options, &nRequest, |
724 | + status = dbGetField(paddr, DBR_STRING, &newSt, &options, &nRequest, |
725 | pfl); |
726 | - pold->status = new.status; |
727 | - pold->severity = new.severity; |
728 | - pold->ackt = new.ackt; |
729 | - pold->acks = new.acks; |
730 | + pold->status = newSt.status; |
731 | + pold->severity = newSt.severity; |
732 | + pold->ackt = newSt.ackt; |
733 | + pold->acks = newSt.acks; |
734 | options = 0; |
735 | nRequest = no_elements; |
736 | status = dbGetField(paddr, DBR_STRING, pold->value, |
737 | |
738 | === modified file 'src/dbStatic/dbStaticLib.c' |
739 | --- src/dbStatic/dbStaticLib.c 2009-08-03 22:22:45 +0000 |
740 | +++ src/dbStatic/dbStaticLib.c 2010-06-16 20:03:31 +0000 |
741 | @@ -516,14 +516,14 @@ |
742 | /* Beginning of Public Routines */ |
743 | |
744 | #define INC_SIZE 256 |
745 | -void epicsShareAPI dbCatString(char **string,int *stringLength,char *new,char *separator) |
746 | +void epicsShareAPI dbCatString(char **string,int *stringLength,char *src,char *separator) |
747 | { |
748 | if((*string==NULL) |
749 | - || ((strlen(*string)+strlen(new)+2) > (size_t)*stringLength)) { |
750 | + || ((strlen(*string)+strlen(src)+2) > (size_t)*stringLength)) { |
751 | char *newString; |
752 | size_t size; |
753 | |
754 | - size = strlen(new); |
755 | + size = strlen(src); |
756 | if(*string) size += strlen(*string); |
757 | /*Make size multiple of INC_SIZE*/ |
758 | size = ((size + 2 + INC_SIZE)/INC_SIZE) * INC_SIZE; |
759 | @@ -538,8 +538,8 @@ |
760 | strcat(*string,separator); |
761 | *stringLength += strlen(separator); |
762 | } |
763 | - strcat(*string,new); |
764 | - *stringLength += strlen(new); |
765 | + strcat(*string,src); |
766 | + *stringLength += strlen(src); |
767 | } |
768 | |
769 | |
770 | dbBase * epicsShareAPI dbAllocBase(void) |
771 | |
772 | === modified file 'src/libCom/osi/os/WIN32/osdProcess.c' |
773 | --- src/libCom/osi/os/WIN32/osdProcess.c 2002-11-26 23:24:16 +0000 |
774 | +++ src/libCom/osi/os/WIN32/osdProcess.c 2010-06-16 20:03:31 +0000 |
775 | @@ -64,16 +64,16 @@ |
776 | startupInfo.wShowWindow = SW_SHOWMINNOACTIVE; |
777 | |
778 | status = CreateProcess ( |
779 | - NULL, // pointer to name of executable module (not required if command line is specified) |
780 | - (char *) pBaseExecutableName, // pointer to command line string |
781 | - NULL, // pointer to process security attributes |
782 | - NULL, // pointer to thread security attributes |
783 | - FALSE, // handle inheritance flag |
784 | - CREATE_NEW_PROCESS_GROUP | DETACHED_PROCESS, // creation flags |
785 | - NULL, // pointer to new environment block (defaults to caller's environement) |
786 | - NULL, // pointer to current directory name (defaults to caller's current directory) |
787 | - &startupInfo, // pointer to STARTUPINFO |
788 | - &processInfo // pointer to PROCESS_INFORMATION |
789 | + NULL, /* pointer to name of executable module (not required if command line is specified) */ |
790 | + (char *) pBaseExecutableName, /* pointer to command line string */ |
791 | + NULL, /* pointer to process security attributes */ |
792 | + NULL, /* pointer to thread security attributes */ |
793 | + FALSE, /* handle inheritance flag */ |
794 | + CREATE_NEW_PROCESS_GROUP | DETACHED_PROCESS, /* creation flags */ |
795 | + NULL, /* pointer to new environment block (defaults to caller's environement) */ |
796 | + NULL, /* pointer to current directory name (defaults to caller's current directory) */ |
797 | + &startupInfo, /* pointer to STARTUPINFO */ |
798 | + &processInfo /* pointer to PROCESS_INFORMATION */ |
799 | ); |
800 | if ( status == 0 ) { |
801 | DWORD W32status; |
802 | @@ -84,7 +84,7 @@ |
803 | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, |
804 | NULL, |
805 | GetLastError (), |
806 | - MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language |
807 | + MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */ |
808 | (LPTSTR) &errStrMsgBuf, |
809 | 0, |
810 | NULL |
811 | @@ -107,24 +107,24 @@ |
812 | FORMAT_MESSAGE_ARGUMENT_ARRAY | 80, |
813 | "%1 \"%2\". %3 %4 %5 \"%6\"", |
814 | 0, |
815 | - MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language |
816 | + MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */ |
817 | (LPTSTR) &complteMsgBuf, |
818 | 0, |
819 | pFmtArgs |
820 | ); |
821 | if (W32status) { |
822 | - // Display the string. |
823 | + /* Display the string. */ |
824 | MessageBox (NULL, complteMsgBuf, "Configuration Problem", |
825 | MB_OK | MB_ICONINFORMATION); |
826 | LocalFree (complteMsgBuf); |
827 | } |
828 | else { |
829 | - // Display the string. |
830 | + /* Display the string. */ |
831 | MessageBox (NULL, errStrMsgBuf, "Failed to start executable", |
832 | MB_OK | MB_ICONINFORMATION); |
833 | } |
834 | |
835 | - // Free the buffer. |
836 | + /* Free the buffer. */ |
837 | LocalFree (errStrMsgBuf); |
838 | } |
839 | else { |
840 | @@ -137,16 +137,17 @@ |
841 | |
842 | return osiSpawnDetachedProcessSuccess; |
843 | |
844 | - // |
845 | - // use of spawn here causes problems when the ca repeater |
846 | - // inherits open files (and sockets) from the spawning |
847 | - // process |
848 | - // |
849 | - //status = _spawnlp (_P_DETACH, pBaseExecutableName, pBaseExecutableName, NULL); |
850 | - //if (status<0) { |
851 | - // errlogPrintf ("!!WARNING!!\n"); |
852 | - // errlogPrintf ("Unable to locate the EPICS executable \"%s\".\n", |
853 | - // pBaseExecutableName); |
854 | - // errlogPrintf ("You may need to modify your environment.\n"); |
855 | - //} |
856 | + /* |
857 | + use of spawn here causes problems when the ca repeater |
858 | + inherits open files (and sockets) from the spawning |
859 | + process |
860 | + |
861 | + status = _spawnlp (_P_DETACH, pBaseExecutableName, pBaseExecutableName, NULL); |
862 | + if (status<0) { |
863 | + errlogPrintf ("!!WARNING!!\n"); |
864 | + errlogPrintf ("Unable to locate the EPICS executable \"%s\".\n", |
865 | + pBaseExecutableName); |
866 | + errlogPrintf ("You may need to modify your environment.\n"); |
867 | + } |
868 | + */ |
869 | } |
Looks fine to me.