Changeset 985 for trunk/dll/inis.c

Timestamp:

Mar 1, 2008, 2:37:14 AM (17 years ago)

Author:

Gregg Young

Message:

Update sizes dialog (ticket 44); Make max command line length user settable (ticket 199); use xfree for free in most cases (ticket 212); initial code to check for valid ini file (ticket 102); Some additional refactoring and structure rework; Some documentation updates;

File:

• trunk/dll/inis.c (modified) (24 diffs)

trunk/dll/inis.c

@@ -25 +25 @@
   09 Jan 08 SHL Standardize PrfOpenProfile return checks
   09 Jan 08 SHL Use CloseProfile to avoid spurious system INI closes
+  29 Feb 08 GKY Use xfree where appropriate
 
 ***********************************************************************/
@@ -212 +213 @@
                                                         app2 : inirec->app),
                                                 pCurrentK, pData, ulSize);
-                          free(pData);  /* free data */
+                          xfree(pData); /* free data */
                         }
                       }
@@ -220 +221 @@
                     }
                   }
-                  free(pDataK);         /* free keynames */
+                  xfree(pDataK);                /* free keynames */
                 }
               }
@@ -256 +257 @@
                                          inirec->key2 : inirec->key),
                                         pData, ulSize);
-                  free(pData);          /* free data */
+                  xfree(pData);         /* free data */
                 }
               }
@@ -291 +292 @@
       PostMsg(inirec->hwndSource, WM_COMMAND, MPFROM2SHORT(INI_REFRESH, 0),
               MPVOID);
-    free(inirec);
+    xfree(inirec);
   }
 }
@@ -316 +317 @@
       WinTerminate(hab2);
     }
-    free(inirec);
+    xfree(inirec);
   }
 }
@@ -402 +403 @@
                                                       pCurrentK, pData,
                                                       ulSize);
-                                free(pData);    /* free data */
+                                xfree(pData);   /* free data */
                               }
                             }
@@ -410 +411 @@
                           }
                         }
-                        free(pDataK);   /* free keynames */
+                        xfree(pDataK);  /* free keynames */
                       }
                     }
@@ -418 +419 @@
                   }
                 }
-                free(pDataA);           /* free applnames */
+                xfree(pDataA);          /* free applnames */
               }
             }
@@ -430 +431 @@
       WinTerminate(hab2);
     }
-    free(prfp->pszUserName);
-    free(prfp->pszSysName);
-    free(prfp);
+    xfree(prfp->pszUserName);
+    xfree(prfp->pszSysName);
+    xfree(prfp);
   }
 }
@@ -465 +466 @@
         WinEnableWindowUpdate(hwndList, TRUE);
       }
-      free(pData);
+      xfree(pData);
     }
   }
@@ -524 +525 @@
         Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
                   "PrfQueryProfileString");
-        free(pData);
+        xfree(pData);
       }
       else {
@@ -1315 +1316 @@
             fixup(inidata->data, p, l, inidata->datalen);
             WinSetDlgItemText(hwnd, IAD_DATA, p);
-            free(p);
+            xfree(p);
           }
         }
@@ -1478 +1479 @@
     hINI = PrfOpenProfile(useHab, filename);
     if (hINI == NULLHANDLE) {
-      free(filename);
+      xfree(filename);
       return (HWND) 0;
     }
@@ -1528 +1529 @@
       PostMsg(hwndClient, UM_INITIALSIZE, MPVOID, MPVOID);
   }
-  else if (filename)
-    free(filename);
+  else
+    xfree(filename);
   return hwndFrame;
 }
@@ -2026 +2027 @@
         inidata->hini = PrfOpenProfile(WinQueryAnchorBlock(hwnd),
                                        inidata->ininame);
-        free(mp1);
+        xfree(mp1);
       }
       else
@@ -2156 +2157 @@
             strcpy(inidata->keyname, keyname);
             strcpy(inidata->applname, applname);
-            if (inidata->data)
-              free(inidata->data);
+            xfree(inidata->data);
             inidata->data = GetKeyData(WinWindowFromID(hwnd,
                                                        INI_DATALIST),
@@ -2344 +2344 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            free(inirec);
+            xfree(inirec);
           }
         }
@@ -2364 +2364 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            free(inirec);
+            xfree(inirec);
           }
         }
@@ -2404 +2404 @@
                          IntraIniProc,
                          FM3ModHandle, INII_FRAME, (PVOID) inirec)) {
-            free(inirec);
+            xfree(inirec);
             break;
           }
@@ -2410 +2410 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            free(inirec);
+            xfree(inirec);
           }
         }
@@ -2448 +2448 @@
               xstrdup(inidata->ininame, pszSrcFile, __LINE__);
             if (!prfp->pszUserName)
-              free(prfp);
+              xfree(prfp);
             else {
               prfp->cchUserName = strlen(prfp->pszUserName);
               prfp->pszSysName = xstrdup(filename, pszSrcFile, __LINE__);
               if (!prfp->pszSysName) {
-                free(prfp->pszUserName);
-                free(prfp);
+                xfree(prfp->pszUserName);
+                xfree(prfp);
               }
               else {
@@ -2462 +2462 @@
                   Runtime_Error(pszSrcFile, __LINE__,
                                 GetPString(IDS_COULDNTSTARTTHREADTEXT));
-                  free(prfp->pszSysName);
-                  free(prfp->pszUserName);
-                  free(prfp);
+                  xfree(prfp->pszSysName);
+                  xfree(prfp->pszUserName);
+                  xfree(prfp);
                 }
                 else
@@ -2763 +2763 @@
         if (inidata->hini != NULLHANDLE && *inidata->ininame)
           CloseProfile(inidata->hini, FALSE);
-        if (inidata->data)
-          free(inidata->data);
+        xfree(inidata->data);
         if (inidata->hwndPopup)
           WinDestroyWindow(inidata->hwndPopup);
-        free(inidata);
+        xfree(inidata);
       }
       if (!dontclose &&