Changeset 12 for trunk/src/helpers/xprf2.c

Timestamp:

Nov 4, 2000, 8:55:45 PM (25 years ago)

Author:

umoeller

Message:

Updated string helpers.

File:

• trunk/src/helpers/xprf2.c (modified) (2 diffs)

trunk/src/helpers/xprf2.c

@@ -220 +220 @@
     if (!pszNew)
         arc = ERROR_INVALID_PARAMETER;
-
-    if (arc == NO_ERROR)
-    {
-
+    else
+    {
         DosDelete(pszNew);
 
         // open new profile
-
         arc = xprfOpenProfile(pszNew,
                               &pxiniNew);
-    }
-
-    // get size of applications list
-    if (arc == NO_ERROR)
-    {
-        if (!PrfQueryProfileSize(hOld, NULL, NULL, &ulSizeOfAppsList))
-            arc = PRFERR_APPSLIST;
-        else
-            if (ulSizeOfAppsList == 0)
+
+        // get size of applications list
+        if (arc == NO_ERROR)
+        {
+            if (!PrfQueryProfileSize(hOld, NULL, NULL, &ulSizeOfAppsList))
                 arc = PRFERR_APPSLIST;
-    }
-
-    if (arc == NO_ERROR)
-    {
-        // get applications list
-        PSZ pApps = (PSZ)malloc(ulSizeOfAppsList);
-        PSZ pApp2 = pApps;
-        if (!PrfQueryProfileData(hOld,
-                                 NULL,
-                                 NULL,
-                                 pApps,
-                                 &ulSizeOfAppsList))
-            arc = PRFERR_APPSLIST;
-
-        // applications loop
-
-        while (   (*pApp2 != 0)
-               && (arc == NO_ERROR)
-              )
-        {
-            CHAR szErrorKey[1000];
-            // copy application (this will call prfhCopyKey in turn)
-            arc = xprfCopyApp(hOld,
-                              pApp2,
-                              pxiniNew,
-                              pApp2,
-                              szErrorKey);
-
+            else
+                if (ulSizeOfAppsList == 0)
+                    arc = PRFERR_APPSLIST;
+
+            if (arc == NO_ERROR)
+            {
+                // get applications list
+                PSZ pApps = (PSZ)malloc(ulSizeOfAppsList);
+                PSZ pApp2 = pApps;
+                if (!PrfQueryProfileData(hOld,
+                                         NULL,
+                                         NULL,
+                                         pApps,
+                                         &ulSizeOfAppsList))
+                    arc = PRFERR_APPSLIST;
+
+                // applications loop
+
+                while (   (*pApp2 != 0)
+                       && (arc == NO_ERROR)
+                      )
+                {
+                    CHAR szErrorKey[1000];
+                    // copy application (this will call prfhCopyKey in turn)
+                    arc = xprfCopyApp(hOld,
+                                      pApp2,
+                                      pxiniNew,
+                                      pApp2,
+                                      szErrorKey);
+
+                    if (pfnProgressCallback)
+                    {
+                        ULONG ulNow2, ulMax2;
+                        ulNow2 = ((1000*(pApp2-pApps)) / ulSizeOfAppsList) + (ulCount*1000);
+                        ulMax2 = (ulMax+1)*1000;
+                        if (!pfnProgressCallback(ulUser, ulNow2, ulMax2))
+                            // aborted:
+                            arc = PRFERR_ABORTED;
+                    }
+
+                    // go for next app
+                    pApp2 += strlen(pApp2)+1;
+
+                } // end while (*pApp2 != 0) && MBID_NOERROR
+
+                if (pApps)
+                    free(pApps);
+            }
+
+            xprfCloseProfile(pxiniNew);
+
+            // progress
             if (pfnProgressCallback)
-            {
-                ULONG ulNow2, ulMax2;
-                ulNow2 = ((1000*(pApp2-pApps)) / ulSizeOfAppsList) + (ulCount*1000);
-                ulMax2 = (ulMax+1)*1000;
-                if (!pfnProgressCallback(ulUser, ulNow2, ulMax2))
-                    // aborted:
-                    arc = PRFERR_ABORTED;
-            }
-
-            // go for next app
-            pApp2 += strlen(pApp2)+1;
-
-        } // end while (*pApp2 != 0) && MBID_NOERROR
-
-        if (pApps)
-            free(pApps);
-    }
-
-    xprfCloseProfile(pxiniNew);
-
-    // progress
-    if (pfnProgressCallback)
-        pfnProgressCallback(ulUser, (ulCount+1) * 1000, (ulMax+1) * 1000);
+                pfnProgressCallback(ulUser, (ulCount+1) * 1000, (ulMax+1) * 1000);
+        }
+    }
 
     return (arc);
@@ -461 +458 @@
     }
 
-    if (    (Profiles.pszSysName)
-         && (Profiles.pszUserName)
-       )
-    {
+    if (Profiles.pszSysName)
         free(Profiles.pszSysName);
+    if (Profiles.pszUserName)
         free(Profiles.pszUserName);
-    }
 
     return (arc);