Changeset 1738
- Timestamp:
- Feb 22, 2014, 8:54:52 PM (12 years ago)
- Location:
- trunk/dll
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/dll/arccnrs.c
r1729 r1738 758 758 } 759 759 } 760 else if (*p) 760 else if (*p) 761 761 p++; 762 762 } … … 2419 2419 */ 2420 2420 { 2421 CHAR *p , *pp;2421 CHAR *p; 2422 2422 ULONG z, was; 2423 2423 APIRET rc; … … 2427 2427 if (rc == ERROR_ACCESS_DENIED) { 2428 2428 p = strrchr(dcd->workdir, '.'); 2429 if (p) { 2429 if (p) { /* jbs: What if there is no "."? Give up? */ 2430 2430 p++; 2431 pp = p; 2432 was = strtoul(p, &pp, 16); 2431 was = strtoul(p, NULL, 16); 2433 2432 for (z = 0; z < 99; z++) { 2434 2433 was++; -
trunk/dll/killproc.c
r1628 r1738 33 33 26 Aug 11 GKY Add a low mem version of xDosAlloc* wrappers; move error checking into all the 34 34 xDosAlloc* wrappers. 35 22 Aug 14 JBS Ticket #519: Corrected mis-coded but probably harmless calls to strtol 36 and removed unneeded second parameter variables. 35 37 36 38 ***********************************************************************/ … … 312 314 if (*s == ' ' && s[5] == ' ' && isxdigit(s[1]) && 313 315 isxdigit(s[2]) && isxdigit(s[3]) && isxdigit(s[4])) { 314 p = &s[1]; 315 pid = strtol(&s[1], &p, 16); 316 pid = strtol(&s[1], NULL, 16); 316 317 if (pid && pid != mypid) { 317 318 strcpy(progname, &s[30]); … … 504 505 if (sSelect >= 0) { 505 506 506 CHAR s[31] , *p;507 CHAR s[31]; 507 508 APIRET error; 508 509 … … 513 514 MPFROM2SHORT(sSelect, 30), MPFROMP(s)); 514 515 if (*s) { 515 p = s; 516 pid = strtol(s, &p, 16); 516 pid = strtol(s, NULL, 16); 517 517 if (pid) { 518 518 if (SHORT1FROMMP(mp1) == DID_OK) {
Note:
See TracChangeset
for help on using the changeset viewer.