Changeset 133 for trunk/src/helpers/xprf.c

Timestamp:

Jan 26, 2002, 4:59:23 PM (24 years ago)

Author:

umoeller

Message:

program plus other fixes

File:

• trunk/src/helpers/xprf.c (modified) (7 diffs)

trunk/src/helpers/xprf.c

@@ -160 +160 @@
                      const char *pcszApp)
 {
-    PXINIAPPDATA pReturn = NULL;
     PLISTNODE pAppNode = lstQueryFirstNode(&pXIni->llApps);
     while (pAppNode)
     {
         PXINIAPPDATA pAppDataThis = (PXINIAPPDATA)pAppNode->pItemData;
-        if (strcmp(pAppDataThis->pszAppName, pcszApp) == 0)
-        {
-            pReturn = pAppDataThis;
-            break;
-        }
+        if (!strcmp(pAppDataThis->pszAppName, pcszApp))
+            return (pAppDataThis);
 
         pAppNode = pAppNode->pNext;
     }
 
-    return (pReturn);
+    return (NULL);
 }
 
@@ -190 +186 @@
                        const char *pcszApp)
 {
-    PXINIAPPDATA pAppData = (PXINIAPPDATA)malloc(sizeof(XINIAPPDATA));
-    if (pAppData)
+    PXINIAPPDATA pAppData;
+    if (pAppData = (PXINIAPPDATA)malloc(sizeof(XINIAPPDATA)))
     {
         pAppData->pszAppName = strdup(pcszApp);
@@ -217 +213 @@
                      const char *pcszKey)
 {
-    PXINIKEYDATA pReturn = NULL;
     PLISTNODE pKeyNode = lstQueryFirstNode(&pAppData->llKeys);
     while (pKeyNode)
     {
         PXINIKEYDATA pKeyDataThis = (PXINIKEYDATA)pKeyNode->pItemData;
-        if (strcmp(pKeyDataThis->pszKeyName, pcszKey) == 0)
-        {
-            pReturn = pKeyDataThis;
-            break;
-        }
+        if (!strcmp(pKeyDataThis->pszKeyName, pcszKey))
+            return (pKeyDataThis);
 
         pKeyNode = pKeyNode->pNext;
     }
 
-    return (pReturn);
+    return (NULL);
 }
 
@@ -249 +241 @@
                        ULONG cbData)            // in: sizeof (*pbData)
 {
-    PXINIKEYDATA pKeyData = (PXINIKEYDATA)malloc(sizeof(XINIKEYDATA));
-    if (pKeyData)
+    PXINIKEYDATA pKeyData;
+    if (pKeyData = (PXINIKEYDATA)malloc(sizeof(XINIKEYDATA)))
     {
         pKeyData->pszKeyName = strdup(pcszKey);
 
-        pKeyData->pbData = (PBYTE)malloc(cbData);
-        if (pKeyData->pbData)
+        if (pKeyData->pbData = (PBYTE)malloc(cbData))
         {
             memcpy(pKeyData->pbData, pbData, cbData);
@@ -377 +368 @@
             == NO_ERROR)
     {
-        PBYTE   pbFileData = (PBYTE)malloc(fs3.cbFile);
-        if (pbFileData)
+        PBYTE  pbFileData;
+        if (pbFileData = (PBYTE)malloc(fs3.cbFile))
         {
             ULONG ulSet = 0;
@@ -508 +499 @@
 
     // allocate buffer for total size
-    pbData2Write = (PBYTE)malloc(ulTotalFileSize);
-    if (pbData2Write)
+    if (pbData2Write = (PBYTE)malloc(ulTotalFileSize))
     {
         APIRET arc = NO_ERROR;
@@ -640 +630 @@
 
         // write out everything
-        arc = DosProtectSetFilePtr(pXIni->hFile,
-                                   0,
-                                   FILE_BEGIN,
-                                   &ulSet,
-                                   pXIni->hLock);
-        if (arc == NO_ERROR)
+        if (!(arc = DosProtectSetFilePtr(pXIni->hFile,
+                                         0,
+                                         FILE_BEGIN,
+                                         &ulSet,
+                                         pXIni->hLock)))
         {
             ULONG cbWritten = 0;
-            arc = DosProtectWrite(pXIni->hFile,
-                                  pbData2Write,
-                                  ulTotalFileSize,
-                                  &cbWritten,
-                                  pXIni->hLock);
-            if (arc == NO_ERROR)
-            {
-                arc = DosProtectSetFileSize(pXIni->hFile,
-                                            ulTotalFileSize,
-                                            pXIni->hLock);
-                if (arc == NO_ERROR)
-                    brc = TRUE;
-            }
+            if (    (!(arc = DosProtectWrite(pXIni->hFile,
+                                             pbData2Write,
+                                             ulTotalFileSize,
+                                             &cbWritten,
+                                             pXIni->hLock)))
+                 && (!(arc = DosProtectSetFileSize(pXIni->hFile,
+                                                   ulTotalFileSize,
+                                                   pXIni->hLock)))
+               )
+                brc = TRUE;
         }