Changeset 1738

Timestamp:

Feb 22, 2014, 8:54:52 PM (12 years ago)

Author:

John Small

Message:

Ticket #519: Corrected mis-coded but probably harmless calls to strtol and removed unneeded second parameter variables.

Location:

trunk/dll

Files:

• arccnrs.c (modified) (3 diffs)
• killproc.c (modified) (4 diffs)

trunk/dll/arccnrs.c

@@ -758 +758 @@
                 }
               }
-              else if (*p) 
+              else if (*p)
                 p++;
             }
@@ -2419 +2419 @@
          */
         {
-          CHAR *p, *pp;
+          CHAR *p;
           ULONG z, was;
           APIRET rc;
@@ -2427 +2427 @@
             if (rc == ERROR_ACCESS_DENIED) {
               p = strrchr(dcd->workdir, '.');
-              if (p) {
+              if (p) {          /* jbs: What if there is no "."? Give up? */
                 p++;
-                pp = p;
-                was = strtoul(p, &pp, 16);
+                was = strtoul(p, NULL, 16);
                 for (z = 0; z < 99; z++) {
                   was++;

trunk/dll/killproc.c

@@ -33 +33 @@
   26 Aug 11 GKY Add a low mem version of xDosAlloc* wrappers; move error checking into all the
                 xDosAlloc* wrappers.
+  22 Aug 14 JBS Ticket #519: Corrected mis-coded but probably harmless calls to strtol
+                and removed unneeded second parameter variables.
 
 ***********************************************************************/
@@ -312 +314 @@
         if (*s == ' ' && s[5] == ' ' && isxdigit(s[1]) &&
             isxdigit(s[2]) && isxdigit(s[3]) && isxdigit(s[4])) {
-          p = &s[1];
-          pid = strtol(&s[1], &p, 16);
+          pid = strtol(&s[1], NULL, 16);
           if (pid && pid != mypid) {
             strcpy(progname, &s[30]);
@@ -504 +505 @@
       if (sSelect >= 0) {
 
-        CHAR s[31], *p;
+        CHAR s[31];
         APIRET error;
 
@@ -513 +514 @@
                           MPFROM2SHORT(sSelect, 30), MPFROMP(s));
         if (*s) {
-          p = s;
-          pid = strtol(s, &p, 16);
+          pid = strtol(s, NULL, 16);
           if (pid) {
             if (SHORT1FROMMP(mp1) == DID_OK) {