Changeset 123 for trunk/src/helpers/configsys.c

Timestamp:

Dec 14, 2001, 11:41:33 PM (24 years ago)

Author:

umoeller

Message:

Lots of changes for icons and refresh.

File:

• trunk/src/helpers/configsys.c (modified) (9 diffs)

trunk/src/helpers/configsys.c

@@ -91 +91 @@
     }
 
-    arc = doshLoadTextFile(pcszFile,
-                           ppszContents);
-
-    if (arc == NO_ERROR)
+    if (!(arc = doshLoadTextFile(pcszFile,
+                                 ppszContents)))
     {
         // convert all \r\n to \n
@@ -316 +314 @@
                      ULONG cbCopyTo)            // out: sizeof(*pszCopyTo)
 {
-    PSZ     p = csysFindKey(pcszSearchIn, pcszKey, NULL, NULL),
+    PSZ     p,
             prc = NULL;
 
-    if (p)
+    if (p = csysFindKey(pcszSearchIn, pcszKey, NULL, NULL))
     {
         prc = p + strlen(pcszKey);
@@ -326 +324 @@
             // copy to pszCopyTo
             ULONG cb;
-            PSZ pEOL = strhFindEOL(prc, &cb);
-            if (pEOL)
+            PSZ pEOL;
+            if (pEOL = strhFindEOL(prc, &cb))
             {
                 if (cb > cbCopyTo)
@@ -370 +368 @@
 {
     BOOL    fIsAllUpperCase = FALSE;
-    PSZ     pKey = csysFindKey(*ppszBuf,
-                               pcszKey,
-                               NULL,
-                               &fIsAllUpperCase),
+    PSZ     pKey,
             pReturn = NULL;
-    if (pKey)
+    if (pKey = csysFindKey(*ppszBuf,
+                           pcszKey,
+                           NULL,
+                           &fIsAllUpperCase))
     {
         // key found in file:
@@ -381 +379 @@
 
         // replace existing parameter
-        PSZ pOldParam = pKey + strlen(pcszKey);
-        // pOldParam now has the old parameter, which we
-        // will overwrite now; pOldParam points into *ppszBuf
-
-        if (pOldParam)
-        {
+        PSZ pOldParam;
+        if (pOldParam = pKey + strlen(pcszKey))
+        {
+            // pOldParam now has the old parameter, which we
+            // will overwrite now; pOldParam points into *ppszBuf
+
             ULONG   ulOldParamOfs = pOldParam - *ppszBuf;
 
-            PSZ pEOL = strhFindEOL(pOldParam, NULL);
-            // pEOL now has first end-of-line after the parameter
-
-            if (pEOL)
+            PSZ pEOL;
+            if (pEOL = strhFindEOL(pOldParam, NULL))
             {
+                // pEOL now has first end-of-line after the parameter
+
                 // char count to replace
                 ULONG   ulToReplace = pEOL - pOldParam;
@@ -477 +475 @@
     BOOL    fIsAllUpperCase = FALSE;
     PSZ     pStartOfLine = NULL;
-    PSZ     pKey = csysFindKey(pszSearchIn,
-                               pszKey,
-                               &pStartOfLine,
-                               &fIsAllUpperCase);
+    PSZ     pKey;
     BOOL    brc = FALSE;
 
-    if (pKey)
-    {
-        PSZ pEOL = strhFindEOL(pKey, NULL);
-        // pEOL now has first end-of-line after the key
-        if (pEOL)
-        {
+    if (pKey = csysFindKey(pszSearchIn,
+                           pszKey,
+                           &pStartOfLine,
+                           &fIsAllUpperCase))
+    {
+        PSZ pEOL;
+        if (pEOL = strhFindEOL(pKey, NULL))
+        {
+            // pEOL now has first end-of-line after the key;
             // go to first character after EOL
             while (    (*pEOL)
@@ -604 +602 @@
 
     // First, check if the new-line string has a "=" char
-    PSZ pSep = strchr(pManip->pszNewLine, '=');
-    if (pSep)
+    PSZ pSep;
+    if (pSep = strchr(pManip->pszNewLine, '='))
     {
         // yes: separate in two strings
@@ -751 +749 @@
                 // Manip.pszSearchString has the search string
                 // before whose line we must insert
-                PSZ pFound = strhistr(*ppszContents,
-                                      pManip->pszVerticalSearchString);
-                if (pFound)
+                PSZ pFound;
+                if (pFound = strhistr(*ppszContents,
+                                      pManip->pszVerticalSearchString))
                 {
                     // search string found:
@@ -777 +775 @@
                 // Manip.pszSearchString has the search string
                 // after whose line we must insert
-                PSZ pFound = strhistr(*ppszContents, pManip->pszVerticalSearchString);
-                if (pFound)
+                PSZ pFound;
+                if (pFound = strhistr(*ppszContents,
+                                      pManip->pszVerticalSearchString))
                 {
                     // search string found: