Changeset 238 for trunk/src/helpers

Timestamp:

Dec 24, 2002, 8:44:35 AM (23 years ago)

Author:

umoeller

Message:

Misc fixes.

Location:

trunk/src/helpers

Files:

• _call_filedlg.c (modified) (2 diffs)
• _test_dialog.c (modified) (1 diff)
• animate.c (modified) (1 diff)
• cctl_checkcnr.c (modified) (1 diff)
• cctl_progbar.c (modified) (1 diff)
• cctl_tooltip.c (modified) (4 diffs)
• comctl.c (modified) (3 diffs)
• configsys.c (modified) (2 diffs)
• datetime.c (modified) (3 diffs)
• debug.c (modified) (22 diffs)
• dosh.c (modified) (15 diffs)
• dosh2.c (modified) (10 diffs)
• eah.c (modified) (25 diffs)
• gpih.c (modified) (1 diff)
• level.c (modified) (1 diff)
• linklist.c (modified) (3 diffs)
• math.c (modified) (5 diffs)
• memdebug.c (modified) (7 diffs)
• memdebug_win.c (modified) (6 diffs)
• prfh.c (modified) (6 diffs)
• prfh2.c (modified) (3 diffs)
• procstat.c (modified) (13 diffs)
• regexp.c (modified) (1 diff)
• shapewin.c (modified) (7 diffs)
• stringh.c (modified) (7 diffs)
• syssound.c (modified) (1 diff)
• textv_html.c (modified) (3 diffs)
• threads.c (modified) (9 diffs)
• timer.c (modified) (4 diffs)
• tmsgfile.c (modified) (7 diffs)
• tree.c (modified) (4 diffs)
• vcard.c (modified) (1 diff)
• winh.c (modified) (7 diffs)
• xml.c (modified) (15 diffs)
• xprf2.c (modified) (1 diff)

trunk/src/helpers/_call_filedlg.c

@@ -52 +52 @@
                                 pfd);
 
-    return (hwndReturn);
+    return hwndReturn;
 }
 
@@ -323 +323 @@
     WinTerminate(hab);
 
-    return (0);
+    return 0;
 }
 

trunk/src/helpers/_test_dialog.c

@@ -753 +753 @@
     WinTerminate(hab);
 
-    return (0);
+    return 0;
 }

trunk/src/helpers/animate.c

@@ -496 +496 @@
     WinTerminate(hab);
 
-    return (0);
+    return 0;
 } */

trunk/src/helpers/cctl_checkcnr.c

@@ -820 +820 @@
         if (DosCreateMutexSem(NULL,
                               &G_hmtxCnrOwnersList, 0, FALSE) != NO_ERROR)
-            return (FALSE);
+            return FALSE;
 
     if (G_pllCnrOwners == NULL)

trunk/src/helpers/cctl_progbar.c

@@ -412 +412 @@
 
         WinSetWindowULong(hwndChart, QWL_USER, (ULONG)pData);
-        return (TRUE);
-    }
-
-    return (FALSE);
+        return TRUE;
+    }
+
+    return FALSE;
 }
 

trunk/src/helpers/cctl_tooltip.c

@@ -146 +146 @@
 
         // create mutex and request it right away
-        return (!DosCreateMutexSem(NULL,
-                                   &G_hmtxSubclassedTools,
-                                   0,
-                                   TRUE));      // request!
+        return !DosCreateMutexSem(NULL,
+                                  &G_hmtxSubclassedTools,
+                                  0,
+                                  TRUE);      // request!
     }
 
@@ -855 +855 @@
 {
     PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
+
     switch ((ULONG)mp1)
     {
@@ -867 +868 @@
     }
 
-    return (0);
+    return 0;
 }
 
@@ -1023 +1024 @@
     }
 
-    return ((MPARAM)FALSE);
+    return (MRESULT)FALSE;
 }
 

trunk/src/helpers/comctl.c

@@ -1182 +1182 @@
         // switch static to icon mode
         pa->ulFlags = ANF_ICON;
-        return (pa);
+        return pa;
     }
 
@@ -1301 +1301 @@
 BOOL ctlStopAnimation(HWND hwndStatic)
 {
-    return (WinStopTimer(WinQueryAnchorBlock(hwndStatic), hwndStatic, 1));
+    return WinStopTimer(WinQueryAnchorBlock(hwndStatic), hwndStatic, 1);
 }
 
@@ -1376 +1376 @@
         if (fPreserveProportions)
             pa->ulFlags |= ANF_PROPORTIONAL;
-        return (pa);
+        return pa;
     }
 

trunk/src/helpers/configsys.c

@@ -1181 +1181 @@
         doshQueryPathSize(G_szSwapperFilename, &ulrc);
 
-    return (ulrc);
+    return ulrc;
 }
 
@@ -1200 +1200 @@
     }
 
-    return (0);
+    return 0;
 } */

trunk/src/helpers/datetime.c

@@ -248 +248 @@
 long dtYears2Days (unsigned yr)
 {
-   return ( yr * 365L
-          + yr / 4
-          - yr / 100
-          + yr / 400);
+   return (   yr * 365L
+            + yr / 4
+            - yr / 100
+            + yr / 400);
 }
 
@@ -326 +326 @@
             case 12 :
                 if (day <= 31)
-                    return (TRUE);
+                    return TRUE;
             break;
 
@@ -334 +334 @@
             case 11 :
                 if (day <= 30)
-                    return (TRUE);
+                    return TRUE;
             break;
 
             case 2 :
                 if (day < 29)
-                    return (TRUE);
+                    return TRUE;
                 else
                     if (day == 29)

trunk/src/helpers/debug.c

@@ -645 +645 @@
     {
         fprintf(LogFile, "Error %u seeking CodeView table in %s\n", errno, FileName);
-        return (18);
+        return 18;
     }
 
@@ -653 +653 @@
     {
         fprintf(LogFile, "Error %u reading debug info from %s\n", errno, FileName);
-        return (19);
+        return 19;
     }
     if (G_eodbug.dbug != DBUGSIG)
     {
         // fprintf(LogFile,"\nNo CodeView information stored.\n");
-        return (100);
+        return 100;
     }
 
@@ -667 +667 @@
     {
         fprintf(LogFile, "Error %u seeking base codeview data in %s\n", errno, FileName);
-        return (20);
+        return 20;
     }
 
@@ -675 +675 @@
     {
         fprintf(LogFile, "Error %u reading base codeview data in %s\n", errno, FileName);
-        return (21);
+        return 21;
     }
 
@@ -684 +684 @@
     {
         fprintf(LogFile, "Error %u seeking dir codeview data in %s\n", errno, FileName);
-        return (22);
+        return 22;
     }
 
@@ -692 +692 @@
     {
         fprintf(LogFile, "Error %u reading dir codeview data in %s\n", errno, FileName);
-        return (23);
+        return 23;
     }
 
@@ -701 +701 @@
     {
         fprintf(LogFile, "Out of memory!");
-        return (-1);
+        return -1;
     }
 
@@ -711 +711 @@
         fprintf(LogFile, "Error %u reading codeview dir table from %s\n", errno, FileName);
         free(pxdi->pDirTab32);
-        return (24);
+        return 24;
     }
 
@@ -1040 +1040 @@
         } // end while modindex
     } // End While i < numdir
+
     free(pxdi->pDirTab32);
-    return (0);
+
+    return 0;
 }
 
@@ -1070 +1072 @@
     {
         fprintf(LogFile, "Error %u seeking CodeView table in %s\n", errno, FileName);
-        return (18);
+        return 18;
     }
 
@@ -1076 +1078 @@
     {
         fprintf(LogFile, "Error %u reading debug info from %s\n", errno, FileName);
-        return (19);
+        return 19;
     }
     if (G_eodbug.dbug != DBUGSIG)
     {
         // fprintf(LogFile,"\nNo CodeView information stored.\n");
-        return (100);
+        return 100;
     }
 
@@ -1087 +1089 @@
     {
         fprintf(LogFile, "Error %u seeking base codeview data in %s\n", errno, FileName);
-        return (20);
+        return 20;
     }
 
@@ -1093 +1095 @@
     {
         fprintf(LogFile, "Error %u reading base codeview data in %s\n", errno, FileName);
-        return (21);
+        return 21;
     }
 
@@ -1099 +1101 @@
     {
         fprintf(LogFile, "Error %u seeking dir codeview data in %s\n", errno, FileName);
-        return (22);
+        return 22;
     }
 
@@ -1105 +1107 @@
     {
         fprintf(LogFile, "Error %u reading dir codeview data in %s\n", errno, FileName);
-        return (23);
+        return 23;
     }
 
@@ -1112 +1114 @@
     {
         fprintf(LogFile, "Out of memory!");
-        return (-1);
+        return -1;
     }
 
@@ -1119 +1121 @@
         fprintf(LogFile, "Error %u reading codeview dir table from %s\n", errno, FileName);
         free(pxdi->pDirTab);
-        return (24);
+        return 24;
     }
 
@@ -1197 +1199 @@
         }                       // end while modindex
     }                           // End While i < numdir
+
     free(pxdi->pDirTab);
-    return (0);
+
+    return 0;
 }
 
@@ -1542 +1546 @@
     SymFile = fopen(SymFileName, "rb");
     if (SymFile == 0)
-        return (2);
+        return 2;
 
     // read in first map definition
@@ -1568 +1572 @@
         if (fseek(SymFile, SegOffset, SEEK_SET))
             // seek error
-            return (3);
+            return 3;
 
         // read in segment definition
@@ -1662 +1666 @@
         SegOffset = NEXTSEGDEFOFFSET(SegDef);
     }                           // endwhile
+
     fclose(SymFile);
-    return (0);         // no error
+
+    return 0;         // no error
 }
 
@@ -1785 +1791 @@
     }
 
-    return (arc == NO_ERROR);
+    return !arc;
 }
 

trunk/src/helpers/dosh.c

@@ -196 +196 @@
               0);
 
-    return (kki.chChar);
+    return kki.chChar;
 }
 
@@ -286 +286 @@
     }
 
-    return (s_ulrc);
+    return s_ulrc;
 }
 
@@ -353 +353 @@
                     &ulms,
                     sizeof(ulms));
-    return (ulms);
+    return ulms;
 }
 
@@ -375 +375 @@
                     ULONG cbData)
 {
-    return (DosDevIOCtl(hf,
-                        ulCategory,
-                        ulFunction,
-                        pvParams, cbParams, &cbParams,
-                        pvData, cbData, &cbData));
+    return DosDevIOCtl(hf,
+                       ulCategory,
+                       ulFunction,
+                       pvParams, cbParams, &cbParams,
+                       pvData, cbData, &cbData);
 }
 
@@ -409 +409 @@
         *parc = ERROR_NOT_ENOUGH_MEMORY;
 
-    return (pv);
+    return pv;
 }
 
@@ -467 +467 @@
 {
     PVOID   pvrc = NULL;
-    APIRET  arc = DosAllocSharedMem((PVOID*)&pvrc,
-                                    (PSZ)pcszName,
-                                    ulSize,
-                                    PAG_COMMIT | PAG_READ | PAG_WRITE);
-    if (arc == NO_ERROR)
-        return (pvrc);
+
+    if (!DosAllocSharedMem((PVOID*)&pvrc,
+                           (PSZ)pcszName,
+                           ulSize,
+                           PAG_COMMIT | PAG_READ | PAG_WRITE))
+        return pvrc;
 
     return NULL;
@@ -494 +494 @@
 {
     PVOID pvrc = NULL;
-    APIRET arc = DosGetNamedSharedMem((PVOID*)pvrc,
-                                      (PSZ)pcszName,
-                                      PAG_READ | PAG_WRITE);
-    if (arc == NO_ERROR)
-        return (pvrc);
+
+    if (!DosGetNamedSharedMem((PVOID*)pvrc,
+                              (PSZ)pcszName,
+                              PAG_READ | PAG_WRITE))
+        return pvrc;
 
     return NULL;
@@ -1977 +1977 @@
         strcpy(FSInfoBuf.szVolLabel, pszNewLabel);
 
-        return (DosSetFSInfo(ulLogicalDrive,
-                             FSIL_VOLSER,
-                             &FSInfoBuf,
-                             sizeof(FSInfoBuf)));
-    }
-    else
-        return (ERROR_LABEL_TOO_LONG);
+        return DosSetFSInfo(ulLogicalDrive,
+                            FSIL_VOLSER,
+                            &FSInfoBuf,
+                            sizeof(FSInfoBuf));
+    }
+
+    return ERROR_LABEL_TOO_LONG;
 }
 
@@ -2169 +2169 @@
     }
 
-    return (pReturn);
+    return pReturn;
 }
 
@@ -3300 +3300 @@
     } while (!doshQueryPathSize(szFilename, &ulDummy));
 
-    return (strdup(szFilename));
+    return strdup(szFilename);
 }
 
@@ -3573 +3573 @@
         // file found:
         return ((fs3.attrFile & FILE_DIRECTORY) != 0);
-    else
-        return FALSE;
+
+    return FALSE;
 }
 
@@ -3636 +3636 @@
     }
 
-    return (arc0);
+    return arc0;
 }
 
@@ -3785 +3785 @@
         arcReturn = DosDeleteDir((PSZ)pcszDir);
 
-    return (arcReturn);
+    return arcReturn;
 }
 
@@ -4324 +4324 @@
 
     // PID is at offset 0 in the local info seg
-    return (*(PUSHORT)G_pvLocalInfoSeg);
+    return *(PUSHORT)G_pvLocalInfoSeg;
 }
 
@@ -4344 +4344 @@
 
     // TID is at offset 6 in the local info seg
-    return (*(PUSHORT)((PBYTE)G_pvLocalInfoSeg + 6));
+    return *(PUSHORT)((PBYTE)G_pvLocalInfoSeg + 6);
 }
 

trunk/src/helpers/dosh2.c

@@ -196 +196 @@
                             lAfterDot = 0;
                             if (ul > 7)
-                                return (ERROR_FILENAME_EXCED_RANGE);
+                                return ERROR_FILENAME_EXCED_RANGE;
                         }
                     }
                     // and check for invalid characters
                     if (strchr(pszInvalid, *pSource) != NULL)
-                        return (ERROR_INVALID_NAME);
+                        return ERROR_INVALID_NAME;
 
                     pSource++;
@@ -211 +211 @@
                             lAfterDot++;
                             if (lAfterDot > 3)
-                                return (ERROR_FILENAME_EXCED_RANGE);
+                                return ERROR_FILENAME_EXCED_RANGE;
                         }
                 }
@@ -221 +221 @@
                     if (lDotOfs == -1)  // dot not found:
                         if (cbFile > 8)
-                            return (ERROR_FILENAME_EXCED_RANGE);
+                            return ERROR_FILENAME_EXCED_RANGE;
             }
 
@@ -333 +333 @@
 {
     APIRET  arc = NO_ERROR;
-    if (!pcszDir)
-        return (ERROR_INVALID_PARAMETER);
-    {
-        if (*pcszDir != 0)
-            if (*(pcszDir+1) == ':')
-            {
-                // drive given:
-                CHAR    cDrive = toupper(*(pcszDir));
-                // change drive
-                arc = DosSetDefaultDisk( (ULONG)(cDrive - 'A' + 1) );
-                        // 1 = A:, 2 = B:, ...
-            }
-
+
+    if (    (!pcszDir)
+         || (!(*pcszDir))
+       )
+        return ERROR_INVALID_PARAMETER;
+
+    if (pcszDir[1] == ':')
+    {
+        // drive given:
+        CHAR    cDrive = toupper(*(pcszDir));
+        // change drive
+        arc = DosSetDefaultDisk( (ULONG)(cDrive - 'A' + 1) );
+                // 1 = A:, 2 = B:, ...
+    }
+
+    if (!arc)
         arc = DosSetCurrentDir((PSZ)pcszDir);
-    }
 
     return arc;       // V0.9.9 (2001-04-04) [umoeller]
@@ -658 +660 @@
     USHORT usCount = 0;
     DosPhysicalDisk(INFO_COUNT_PARTITIONABLE_DISKS, &usCount, 2, 0, 0);
-    return (usCount);
+    return usCount;
 }
 
@@ -923 +925 @@
 STATIC USHORT GetCyl(USHORT rBeginSecCyl)
 {
-    return (   (rBeginSecCyl & 0x00C0) << 2)
-             + ((rBeginSecCyl & 0xFF00) >> 8);
+    return   ((rBeginSecCyl & 0x00C0) << 2)
+           + ((rBeginSecCyl & 0xFF00) >> 8);
 }
 
@@ -1005 +1007 @@
     }
 
-    return (ERROR_NOT_SUPPORTED);
+    return ERROR_NOT_SUPPORTED;
 }
 
@@ -1392 +1394 @@
 
     if (!ppList)
-        return (ERROR_INVALID_PARAMETER);
+        return ERROR_INVALID_PARAMETER;
 
     if (!(arc = doshQueryLVMInfo(&pLVMInfo)))
@@ -1459 +1461 @@
 {
     if (!ppList)
-        return (ERROR_INVALID_PARAMETER);
-    else
-    {
-        CleanPartitionInfos(ppList->pPartitionInfo);
-        doshFreeLVMInfo(ppList->pLVMInfo);
-        free(ppList);
-    }
+        return ERROR_INVALID_PARAMETER;
+
+    CleanPartitionInfos(ppList->pPartitionInfo);
+    doshFreeLVMInfo(ppList->pLVMInfo);
+    free(ppList);
 
     return NO_ERROR;
@@ -1859 +1859 @@
 
     if (!pLVMInfo)
-        return (ERROR_INVALID_PARAMETER);
+        return ERROR_INVALID_PARAMETER;
 
     // initialize LVM engine

trunk/src/helpers/eah.c

@@ -242 +242 @@
     }
 
-    return (ulTotalEASize);
+    return ulTotalEASize;
 }
 
@@ -254 +254 @@
 PEALIST eaPathReadAll(const char *pcszPath)
 {
-    return (ReadEAList(ENUMEA_REFTYPE_PATH, (PSZ)pcszPath));
+    return ReadEAList(ENUMEA_REFTYPE_PATH, (PSZ)pcszPath);
 }
 
@@ -264 +264 @@
 PEALIST eaHFileReadAll(HFILE hfile)
 {
-    return (ReadEAList(ENUMEA_REFTYPE_FHANDLE, (&hfile)));
+    return ReadEAList(ENUMEA_REFTYPE_FHANDLE, (&hfile));
 }
 
@@ -278 +278 @@
 PEABINDING eaPathReadOneByIndex(const char *pcszPath, ULONG index)
 {
-    return (ReadEAByIndex(ENUMEA_REFTYPE_PATH, (PSZ)pcszPath, index));
+    return ReadEAByIndex(ENUMEA_REFTYPE_PATH, (PSZ)pcszPath, index);
 }
 
@@ -288 +288 @@
 PEABINDING eaHFileReadOneByIndex(HFILE hfile, ULONG index)
 {
-    return (ReadEAByIndex(ENUMEA_REFTYPE_FHANDLE, (&hfile), index));
+    return ReadEAByIndex(ENUMEA_REFTYPE_FHANDLE, (&hfile), index);
 }
 
@@ -300 +300 @@
 PEABINDING eaPathReadOneByName(const char *pcszPath, const char *pcszEAName)
 {
-    return (ReadEAByName(ENUMEA_REFTYPE_PATH, (PSZ)pcszPath, (PSZ)pcszEAName));
+    return ReadEAByName(ENUMEA_REFTYPE_PATH, (PSZ)pcszPath, (PSZ)pcszEAName);
 }
 
@@ -310 +310 @@
 PEABINDING eaHFileReadOneByName(HFILE hfile, const char *pcszEAName)
 {
-    return (ReadEAByName(ENUMEA_REFTYPE_FHANDLE, (&hfile), (PSZ)pcszEAName));
+    return ReadEAByName(ENUMEA_REFTYPE_FHANDLE, (&hfile), (PSZ)pcszEAName);
 }
 
@@ -334 +334 @@
 APIRET eaPathWriteAll(const char *pcszPath, PEALIST list)
 {
-    return (WriteEAList(ENUMEA_REFTYPE_PATH, (PSZ)pcszPath, list));
+    return WriteEAList(ENUMEA_REFTYPE_PATH, (PSZ)pcszPath, list);
 }
 
@@ -346 +346 @@
 APIRET eaHFileWriteAll(HFILE hfile, PEALIST list)
 {
-    return (WriteEAList(ENUMEA_REFTYPE_FHANDLE, (&hfile), list));
+    return WriteEAList(ENUMEA_REFTYPE_FHANDLE, (&hfile), list);
 }
 
@@ -365 +365 @@
 APIRET eaPathWriteOne(const char *pcszPath, PEABINDING peab)
 {
-    return (WriteEA(ENUMEA_REFTYPE_PATH, (PSZ)pcszPath, peab));
+    return WriteEA(ENUMEA_REFTYPE_PATH, (PSZ)pcszPath, peab);
 }
 
@@ -377 +377 @@
 APIRET eaHFileWriteOne(HFILE hfile, PEABINDING peab)
 {
-    return (WriteEA(ENUMEA_REFTYPE_FHANDLE, (&hfile), peab));
+    return WriteEA(ENUMEA_REFTYPE_FHANDLE, (&hfile), peab);
 }
 
@@ -398 +398 @@
     eab.usValueLength = 0;
     eab.pszValue = 0;
-    return (eaPathWriteOne(pcszPath, &eab));
+    return eaPathWriteOne(pcszPath, &eab);
 }
 
@@ -431 +431 @@
             // first USHORT always has EAT_* flag
             usReturn = *((PUSHORT)(peab->pszValue));
-    return (usReturn);
+    return usReturn;
 }
 
@@ -465 +465 @@
     }
 
-    return (pszReturn);
+    return pszReturn;
 }
 
@@ -533 +533 @@
     }
 
-    return (peab);
+    return peab;
 }
 
@@ -583 +583 @@
     }
 
-    return (usReturn);
+    return usReturn;
 }
 
@@ -722 +722 @@
     } // end if (usEAType == EAT_MVMT)
 
-    return (pszReturn);
+    return pszReturn;
 }
 
@@ -819 +819 @@
     }
 
-    return (pszTotal);
+    return pszTotal;
 }
 
@@ -933 +933 @@
     } // end if (pszInput)
 
-    return (peab);
+    return peab;
 }
 
@@ -976 +976 @@
         index += 1;
     }
-    return (head);
+    return head;
 }
 
@@ -1010 +1010 @@
             return NULL;
         if ((strcmp(name, (dena->szName))) == 0)
-            return (GetEAValue(type, pfile, dena));
+            return GetEAValue(type, pfile, dena);
         free(dena);
         index += 1;
@@ -1057 +1057 @@
     {
         free(dena);
-        return (0);
+        return 0;
     }
-    else
-        return (dena);
+
+    return dena;
 }
 
@@ -1086 +1086 @@
     free(eaop.fpGEA2List);
     if (arc == NO_ERROR)
-        return (ConvertFeal2Binding(eaop.fpFEA2List));
-    else
-        return NULL;
+        return ConvertFeal2Binding(eaop.fpFEA2List);
+
+    return NULL;
 }
 
@@ -1142 +1142 @@
         free(feal);
     }
-    return (binding);
+
+    return binding;
 }
 
@@ -1216 +1217 @@
                 (EA_BINDING_VALUE (binding)),
                 (fea->cbValue));
-    return (feal);
+    return feal;
 }
 

trunk/src/helpers/gpih.c

@@ -1092 +1092 @@
     if (!G_hmtxLCIDs)
         // first call: create
-        return (!DosCreateMutexSem(NULL,
-                                   &G_hmtxLCIDs,
-                                   0,
-                                   TRUE));     // request!
+        return !DosCreateMutexSem(NULL,
+                                  &G_hmtxLCIDs,
+                                  0,
+                                  TRUE);     // request!
 
     // subsequent calls: request

trunk/src/helpers/level.c

@@ -529 +529 @@
 STATIC PSYSLEVELDATA _allocsysleveldata(HFILE hFile)
 {
-    return (PSYSLEVELDATA) malloc(sizeof(SYSLEVELDATA));
+    return (PSYSLEVELDATA)malloc(sizeof(SYSLEVELDATA));
 }
 

trunk/src/helpers/linklist.c

@@ -113 +113 @@
 void* lstMalloc(size_t size)
 {
-    return (malloc(size));
+    return malloc(size);
 }
 
@@ -128 +128 @@
 void* lstStrDup(const char *pcsz)
 {
-    return (strdup(pcsz));
+    return strdup(pcsz);
 }
 
@@ -521 +521 @@
     PLISTNODE pNode;
     if (pNode = lstNodeFromIndex(pList, ulIndex))
-        return (pNode->pItemData);
-    else
-        return (0);
+        return pNode->pItemData;
+
+    return NULL;
 }
 

trunk/src/helpers/math.c

@@ -64 +64 @@
     }
 
-    return (a);
+    return a;
 
 }
@@ -225 +225 @@
     }
 
-    return (rc);
+    return rc;
 }
 
@@ -310 +310 @@
     {
         if (!rc)
-            return (0);
+            return 0;
 
         rc++;
@@ -318 +318 @@
     }
 
-    return (rc);
+    return rc;
 }
 
@@ -353 +353 @@
     }
 
-    return (d);
-}
-
-
+    return d;
+}
+
+

trunk/src/helpers/memdebug.c

@@ -199 +199 @@
     }
     else
-        return (!DosRequestMutexSem(G_hmtxMallocList,
-                                    SEM_INDEFINITE_WAIT));
-
-    return (FALSE);
+        return !DosRequestMutexSem(G_hmtxMallocList,
+                                   SEM_INDEFINITE_WAIT);
+
+    return FALSE;
 }
 
@@ -246 +246 @@
 STATIC PHEAPITEM FindHeapItem(void *p)
 {
-    return ((PHEAPITEM)treeFind(G_pHeapItemsRoot,
-                                (ULONG)p,
-                                treeCompareKeys));
+    return (PHEAPITEM)treeFind(G_pHeapItemsRoot,
+                               (ULONG)p,
+                               treeCompareKeys);
 }
 
@@ -417 +417 @@
         }
 
-    return (prc);
+    return prc;
 }
 
@@ -440 +440 @@
                          pcszFunction);
     memset(p, 0, num * stSize);
-    return (p);
+    return p;
 }
 
@@ -547 +547 @@
         // p == NULL: this is valid, use malloc() instead
         // V0.9.12 (2001-05-21) [umoeller]
-        return (memdMalloc(stSize, pcszSourceFile, ulLine, pcszFunction));
+        return memdMalloc(stSize, pcszSourceFile, ulLine, pcszFunction);
 
     if (memdLock())
@@ -665 +665 @@
     }
 
-    return (prc);
+    return prc;
 }
 
@@ -727 +727 @@
     }
 
-    return (ulItemsReleased);
+    return ulItemsReleased;
 }
 

trunk/src/helpers/memdebug_win.c

@@ -151 +151 @@
                 ulTotalAllocated += Size;
         }
-        return (0);
+        return 0;
     }
 
@@ -194 +194 @@
             }
             else
-                return (1);     // stop
+                return 1;     // stop
         }
 
-        return (0);
+        return 0;
     }
 
@@ -416 +416 @@
     if ((pmrc1) && (pmrc2))
         if (pmrc1->ulIndex < pmrc2->ulIndex)
-            return (-1);
+            return -1;
         else if (pmrc1->ulIndex > pmrc2->ulIndex)
-            return (1);
-
-    return (0);
+            return 1;
+
+    return 0;
 }
 
@@ -439 +439 @@
                                       0))
             {
-                case WCS_LT: return (-1);
-                case WCS_GT: return (1);
+                case WCS_LT: return -1;
+                case WCS_GT: return 1;
                 default:    // equal
                     if (pmrc1->ulLine < pmrc2->ulLine)
-                        return (-1);
+                        return -1;
                     else if (pmrc1->ulLine > pmrc2->ulLine)
-                        return (1);
+                        return 1;
 
             }
 
-    return (0);
+    return 0;
 }
 
@@ -464 +464 @@
     {
         if (pmrc1->ulSize > pmrc2->ulSize)
-            return (1);
+            return 1;
         else if (pmrc1->ulSize < pmrc2->ulSize)
-            return (-1);
+            return -1;
     }
 
-    return (0);
+    return 0;
 }
 
@@ -484 +484 @@
     {
         if (pmrc1->ulAddress > pmrc2->ulAddress)
-            return (1);
+            return 1;
         else if (pmrc1->ulAddress < pmrc2->ulAddress)
-            return (-1);
+            return -1;
     }
 
-    return (0);
+    return 0;
 }
 

trunk/src/helpers/prfh.c

@@ -166 +166 @@
         *pcbBuf = ulSizeOfData;
 
-    return (pData);
+    return pData;
 }
 
@@ -213 +213 @@
         *pcbBuf = ulSizeOfData;
 
-    return (pData);
+    return pData;
 }
 
@@ -239 +239 @@
                           szDefault,
                           szTemp, sizeof(szTemp)-1);
-    return (szTemp[0]);
+    return szTemp[0];
 }
 
@@ -260 +260 @@
                 sizeof(szColor)-1);
     sscanf(szColor, "%lu %lu %lu ", &r, &g, &b);
-    return (LONG)(r*0x10000 + g*0x100 + b);
+    return (LONG)(r * 0x10000 + g * 0x100 + b);
 }
 
@@ -344 +344 @@
         ulrc = PRFERR_DATASIZE;
 
-    return (ulrc);
+    return ulrc;
 }
 
@@ -518 +518 @@
     }
 
-    return (ulrc);
+    return ulrc;
 }
 

trunk/src/helpers/prfh2.c

@@ -109 +109 @@
     }
 
-    return (ulrc);
+    return ulrc;
 }
 
@@ -129 +129 @@
     sprintf(szError2, "An error occured copying the profile %s: \n%s",
             pcszINI, pszErrorString);
-    return (prfhINIError(ulOptions, fLog, fncbError, szError2));
+    return prfhINIError(ulOptions, fLog, fncbError, szError2);
 }
 
@@ -638 +638 @@
 
     if (ulErrorOccured != MBID_IGNORE)
-        return (999);
+        return 999;
     else
         return NO_ERROR;

trunk/src/helpers/procstat.c

@@ -94 +94 @@
 
     if (!ppps)
-        return (ERROR_INVALID_PARAMETER);
+        return ERROR_INVALID_PARAMETER;
 
     // changed allocation V0.9.10 (2001-04-08) [umoeller]:
@@ -187 +187 @@
     }
 
-    return (pReturn);
+    return pReturn;
 }
 
@@ -222 +222 @@
     }
 
-    return (pReturn);
+    return pReturn;
 }
 
@@ -300 +300 @@
     }
 
-    return (rc);
+    return rc;
 }
 
@@ -349 +349 @@
     }
 
-    return (ulrc);
+    return ulrc;
 }
 
@@ -394 +394 @@
     }
 
-    return (ulrc);
+    return ulrc;
 }
 
@@ -483 +483 @@
     if (prc16QueryThreadInfo(pps, usPID, usTID, &prct))
         ulrc = prct.ulPriority;
-    return (ulrc);
+    return ulrc;
 }
 
@@ -533 +533 @@
 
             if (arc == NO_ERROR)
-                return ((PQTOPLEVEL32)pBuf);
+                return (PQTOPLEVEL32)pBuf;
             else
                 DosFreeMem(pBuf);
@@ -594 +594 @@
 
     if (pProcThis->ulRecType == 1)
-        return (pProcThis);
-    else
-        return NULL;
+        return pProcThis;
+
+    return NULL;
 }
 
@@ -649 +649 @@
     {
         if (i == usSemID)
-            return (pSemThis);
+            return pSemThis;
 
         i++;
@@ -678 +678 @@
     {
         if (pSemThis->usIndex == usSemID)
-            return (pSemThis);
+            return pSemThis;
 
         pSemThis = pSemThis->pNext;
@@ -704 +704 @@
     {
         if (pShrMem->usHandle == usShrMemID)
-            return (pShrMem);
+            return pShrMem;
         pShrMem = pShrMem->pNext;
     }
@@ -759 +759 @@
         {
             if (pFile->paFiles[ul].usSFN == usFileID)
-                return (pFile);
+                return pFile;
         }
 

trunk/src/helpers/regexp.c

@@ -1011 +1011 @@
             return MTYPE_CREP;
         default:
-            return (MTYPE) - 1;
+            return (MTYPE)-1;
     }
 }

trunk/src/helpers/shapewin.c

@@ -537 +537 @@
             pRgn = (PSHPREGION)PVOIDFROMMP(mp1);
             WinSetWindowPtr(hwnd, 0, (PVOID) pRgn);
-        return (MRESULT) FALSE;
+        return (MRESULT)FALSE;
 
         /*
@@ -549 +549 @@
             shprgnDraw(hps, pRgn);
             WinEndPaint(hps)  ;
-        return (MRESULT) 0;
+        return (MRESULT)0;
 
         case WM_MOUSEMOVE    :
@@ -1173 +1173 @@
 
             if (pCtrl == NULL)
-                return (MRESULT) TRUE;
+                return (MRESULT)TRUE;
 
             // store control data in window words
             WinSetWindowPtr(hwnd, 0, (PVOID) pCtrl);
-            return (MRESULT) FALSE;
+            return (MRESULT)FALSE;
 
         /*
@@ -1187 +1187 @@
             // TRACE("WM_DESTORY\n");
             shpmgrWMDestroy(pCtrl);
-            return (MRESULT) 0;
+            return (MRESULT)0;
 
         /*
@@ -1212 +1212 @@
             // never show ourselves
             pswp->fl &= ~SWP_SHOW;
-            return (MRESULT) 0;
+            return (MRESULT)0;
 
         /*
@@ -1221 +1221 @@
         case SHAPEWIN_MSG_UPDATE:
             shpmgrUpdateRegions(pCtrl, (PRECTL) PVOIDFROMMP(mp1));
-            return (MRESULT) 0;
+            return (MRESULT)0;
 
         /*
@@ -1270 +1270 @@
             WinValidateRect(hwnd, NULL, FALSE);
             // WinEndPaint(hps);
-            return (MRESULT) 0;
+            return (MRESULT)0;
         }
 

trunk/src/helpers/stringh.c

@@ -220 +220 @@
  *@@ strhdup:
  *      like strdup, but this one doesn't crash if pszSource
- *      is NULL, but returns NULL also. In addition, this
+ *      is NULL. Instead, this returns NULL if pcszSource is
+ *      NULL or points to a null byte. In addition, this
  *      can report the length of the string (V0.9.16).
  *
@@ -407 +408 @@
 {
     if (pcsz) //  && *pcsz) // V0.9.18 (2002-03-27) [umoeller]
-        return (strlen(pcsz) + 1);
+        return strlen(pcsz) + 1;
 
     return 0;
@@ -1028 +1029 @@
         *pulOffset = prc - pcszSearchIn;
 
-    return ((PSZ)prc);
+    return (PSZ)prc;
 }
 
@@ -1855 +1856 @@
 
     if (pattern_size == 0)              //  Empty patterns match at start
-        return ((void *)block);
+        return (void*)block;
 
     //  Build the shift table unless we're continuing a previous search
@@ -1901 +1902 @@
             // If we found a match, return the start address
             if (match_size >= pattern_size)
-                return ((void*)(match_base));
+                return (void*)match_base;
 
         }
@@ -1959 +1960 @@
 
     if (pattern_size == 0)              //  Empty string matches at start
-        return (char *) string;
+        return (char*)string;
 
     //  Build the shift table
@@ -1997 +1998 @@
             //  If we found a match, return the start address
             if (match_size >= pattern_size)
-                return ((char *)(match_base));
+                return (char*)match_base;
           }
       }

trunk/src/helpers/syssound.c

@@ -472 +472 @@
     {
         free(pszExisting);
-        return (TRUE);
-    }
-
-    return (FALSE);
+        return TRUE;
+    }
+
+    return FALSE;
     */
 

trunk/src/helpers/textv_html.c

@@ -991 +991 @@
                 case 'd': // DD
                     if ((*p2 == 0) && (!fEndOfTag))
-                        return (TagDD);
+                        return TagDD;
                 break;
 
@@ -1250 +1250 @@
     }
 
-    return (pProcessor);
+    return pProcessor;
 }
 
@@ -1863 +1863 @@
     }
 
-    return (crc);
+    return crc;
 }
 

trunk/src/helpers/threads.c

@@ -390 +390 @@
     }
 
-    return (ulrc);
+    return ulrc;
 }
 
@@ -477 +477 @@
     }
 
-    return (ulrc);
+    return ulrc;
 }
 
@@ -526 +526 @@
     }
 
-    return (pArray);
+    return pArray;
 }
 
@@ -577 +577 @@
     {
         pti->fExit = TRUE;
-        return (TRUE);
-    }
-    return (FALSE);
+        return TRUE;
+    }
+    return FALSE;
 }
 
@@ -605 +605 @@
             DosWaitThread(&pti->tid, DCWW_WAIT);
             pti->tid = NULLHANDLE;
-            return (TRUE);
+            return TRUE;
         }
-    return (FALSE);
+    return FALSE;
 }
 
@@ -624 +624 @@
         thrWait(pti);
     }
-    return (TRUE);
+    return TRUE;
 }
 
@@ -649 +649 @@
         DosKillThread(pti->tid);
     }
-    return (TRUE);
+    return TRUE;
 }
 
@@ -662 +662 @@
 {
     if (pti)
-        return (pti->tid);
-
-    return (NULLHANDLE);
+        return pti->tid;
+
+    return NULLHANDLE;
 }
 
@@ -691 +691 @@
         if (ptib)
             if (ptib->tib_ptib2)
-                return (ptib->tib_ptib2->tib2_ulpri);
-    return (0);
-}
-
-
+                return ptib->tib_ptib2->tib2_ulpri;
+    return 0;
+}
+
+

trunk/src/helpers/timer.c

@@ -162 +162 @@
 {
     if (!G_hmtxTimers)
-        return (!DosCreateMutexSem(NULL,
-                                   &G_hmtxTimers,
-                                   0,
-                                   TRUE));      // request!
-    else
-        return !DosRequestMutexSem(G_hmtxTimers, SEM_INDEFINITE_WAIT);
+        return !DosCreateMutexSem(NULL,
+                                  &G_hmtxTimers,
+                                  0,
+                                  TRUE);      // request!
+
+    return !DosRequestMutexSem(G_hmtxTimers, SEM_INDEFINITE_WAIT);
 }
 
@@ -207 +207 @@
                )
             {
-                return (pTimer);
+                return pTimer;
             }
 
@@ -394 +394 @@
     }
 
-    return (pSet);
+    return pSet;
 }
 
@@ -733 +733 @@
     }
 
-    return (usrc);
+    return usrc;
 }
 

trunk/src/helpers/tmsgfile.c

@@ -148 +148 @@
  *@@added V0.9.18 (2002-03-24) [umoeller]
  *@@changed V0.9.20 (2002-07-19) [umoeller]: optimized, no longer holding all msgs im mem
+ *@@changed V1.0.1 (2002-12-16) [pr]: Ctrl-Z fix
  */
 
@@ -181 +182 @@
                 cbRead - 1);    // not including null byte
 
-        // convert to plain C format
-        /* xstrConvertLineFormat(&pTmf->strContent,
-                              CRLF2LF);
-        */
-
-        // kick out all the comments
-        /*
-        while (pStartOfMarker = strstr(pTmf->strContent.psz, "\n;"))
-        {
-            // copy the next line over this
-            PCSZ pEOL = strhFindEOL(pStartOfMarker + 2, NULL);
-            xstrrpl(&pTmf->strContent,
-                    // ofs of first char to replace: "\n;"
-                    pStartOfMarker - pTmf->strContent.psz,
-                    // no. of chars to replace:
-                    pEOL - pStartOfMarker,
-                    // string to replace chars with:
-                    NULL,
-                    // length of replacement string:
-                    0);
-        }
-        */
-
-        // free excessive memory
-        // xstrShrink(&pTmf->strContent);
-
+        // go build a tree of all message IDs...
         pStartOfFile = strContents.psz;
-
-        // go build a tree of all message IDs...
 
         // find first start message marker
@@ -301 +275 @@
                         pNew->cbText = strlen(pStartOfText);
 
-                // remove trailing newlines
+                // remove trailing newlines and Ctrl-Z
                 while (    (pNew->cbText)
                         && (    (pStartOfText[pNew->cbText - 1] == '\n')
                              || (pStartOfText[pNew->cbText - 1] == '\r')
+                             || (pStartOfText[pNew->cbText - 1] == '\x1a') // V1.0.1 (2002-12-16) [pr]
                            )
                       )
@@ -335 +310 @@
  *
  *      Use tmfCloseMessageFile to close the file
- *      again and free all resources. This thing
- *      can allocate quite a bit of memory.
+ *      again and free all resources.
  *
  *      Returns:
@@ -415 +389 @@
 STATIC VOID FreeInternalMem(PTMFMSGFILE pTmf)
 {
-    LONG   cItems;
+    LONG    cItems;
     TREE**  papNodes;
 
-    if (cItems = pTmf->cIDs)
+    if (    (cItems = pTmf->cIDs)
+         && (papNodes = treeBuildArray(pTmf->IDsTreeRoot,
+                                       &cItems))
+       )
     {
-        if (papNodes = treeBuildArray(pTmf->IDsTreeRoot,
-                                      &cItems))
+        ULONG ul;
+        for (ul = 0; ul < cItems; ul++)
         {
-            ULONG ul;
-            for (ul = 0; ul < cItems; ul++)
-            {
-                PMSGENTRY pNodeThis = (PMSGENTRY)(papNodes[ul]);
-
-                xstrClear(&pNodeThis->strID);
-
-                free(pNodeThis);
-            }
-
-            free(papNodes);
+            PMSGENTRY pNodeThis = (PMSGENTRY)(papNodes[ul]);
+
+            xstrClear(&pNodeThis->strID);
+
+            free(pNodeThis);
         }
+
+        free(papNodes);
     }
 }
@@ -464 +437 @@
     }
 
-    return (ERROR_INVALID_PARAMETER);
+    return ERROR_INVALID_PARAMETER;
 }
 
@@ -503 +476 @@
                      ULONG cTableEntries)       // in: count of items in pTable or null
 {
-    APIRET arc = NO_ERROR;
+    APIRET  arc;
+    ULONG   cbFile;
+    PXFILE  pFile;
 
     if (    (!pMsgFile)
          || (!pMsgFile->pszFilename)
        )
-        arc = ERROR_INVALID_PARAMETER;
-    else
+        return ERROR_INVALID_PARAMETER;
+
+    // open the file again V0.9.20 (2002-07-19) [umoeller]
+    if (!(arc = doshOpen(pMsgFile->pszFilename,
+                         XOPEN_READ_EXISTING,
+                         &cbFile,
+                         &pFile)))
     {
-        // open the file again V0.9.20 (2002-07-19) [umoeller]
-        ULONG   cbFile;
-        PXFILE  pFile;
-        if (!(arc = doshOpen(pMsgFile->pszFilename,
-                             XOPEN_READ_EXISTING,
-                             &cbFile,
-                             &pFile)))
+        // check if last-write date/time changed compared
+        // to the last time we opened the thing...
+        // V0.9.18 (2002-03-24) [umoeller]
+        FILESTATUS3 fs3;
+        if (!(arc = DosQueryFileInfo(pFile->hf,
+                                     FIL_STANDARD,
+                                     &fs3,
+                                     sizeof(fs3))))
         {
-            // check if last-write date/time changed compared
-            // to the last time we opened the thing...
-            // V0.9.18 (2002-03-24) [umoeller]
-            FILESTATUS3 fs3;
-            if (!(arc = DosQueryFileInfo(pFile->hf,
-                                         FIL_STANDARD,
-                                         &fs3,
-                                         sizeof(fs3))))
+            CHAR szTemp[30];
+            dtCreateFileTimeStamp(szTemp,
+                                  &fs3.fdateLastWrite,
+                                  &fs3.ftimeLastWrite);
+            if (strcmp(szTemp, pMsgFile->szTimestamp))
             {
-                CHAR szTemp[30];
-                dtCreateFileTimeStamp(szTemp,
-                                      &fs3.fdateLastWrite,
-                                      &fs3.ftimeLastWrite);
-                if (strcmp(szTemp, pMsgFile->szTimestamp))
+                // last write date changed:
+                _Pmpf((__FUNCTION__ ": timestamp changed, recompiling"));
+                FreeInternalMem(pMsgFile);
+
+                if (!(arc = LoadAndCompile(pMsgFile, pFile)))
+                    strcpy(pMsgFile->szTimestamp, szTemp);
+            }
+        }
+
+        if (!arc)
+        {
+            // go find the message in the tree
+            PMSGENTRY pEntry;
+            if (!(pEntry = (PMSGENTRY)treeFind(pMsgFile->IDsTreeRoot,
+                                               (ULONG)pcszMessageName,
+                                               treeCompareStrings)))
+                arc = ERROR_MR_MID_NOT_FOUND;
+            else
+            {
+                PSZ     pszMsg;
+                ULONG   cbRead = pEntry->cbText;
+
+                if (!(pszMsg = (PSZ)malloc(cbRead + 1)))
+                    arc = ERROR_NOT_ENOUGH_MEMORY;
+                else if (!(arc = doshReadAt(pFile,
+                                            pEntry->ulOfsText,
+                                            &cbRead,
+                                            pszMsg,
+                                            DRFL_NOCACHE | DRFL_FAILIFLESS)))
                 {
-                    // last write date changed:
-                    _Pmpf((__FUNCTION__ ": timestamp changed, recompiling"));
-                    FreeInternalMem(pMsgFile);
-
-                    if (!(arc = LoadAndCompile(pMsgFile, pFile)))
-                        strcpy(pMsgFile->szTimestamp, szTemp);
-                }
-            }
-
-            if (!arc)
-            {
-                // go find the message in the tree
-                PMSGENTRY pEntry;
-                if (!(pEntry = (PMSGENTRY)treeFind(pMsgFile->IDsTreeRoot,
-                                                   (ULONG)pcszMessageName,
-                                                   treeCompareStrings)))
-                    arc = ERROR_MR_MID_NOT_FOUND;
-                else
-                {
-                    PSZ     pszMsg;
-                    ULONG   cbRead = pEntry->cbText;
-
-                    if (!(pszMsg = (PSZ)malloc(cbRead + 1)))
-                        arc = ERROR_NOT_ENOUGH_MEMORY;
-                    else if (!(arc = doshReadAt(pFile,
-                                                pEntry->ulOfsText,
-                                                &cbRead,
-                                                pszMsg,
-                                                DRFL_NOCACHE | DRFL_FAILIFLESS)))
+                    // null-terminate
+                    pszMsg[cbRead] = '\0';
+                    xstrset2(pstr,
+                             pszMsg,
+                             cbRead);
+
+                    // kick out \r\n
+                    xstrConvertLineFormat(pstr,
+                                          CRLF2LF);
+
+                    // now replace strings from the table
+                    if (cTableEntries && pTable)
                     {
-                        // null-terminate
-                        pszMsg[cbRead] = '\0';
-                        xstrset2(pstr,
-                                 pszMsg,
-                                 cbRead);
-
-                        // kick out \r\n
-                        xstrConvertLineFormat(pstr,
-                                              CRLF2LF);
-
-                        // now replace strings from the table
-                        if (cTableEntries && pTable)
+                        CHAR szFind[10] = "%0";
+                        ULONG ul;
+                        for (ul = 0;
+                             ul < cTableEntries;
+                             ul++)
                         {
-                            CHAR szFind[10] = "%0";
-                            ULONG ul;
-                            for (ul = 0;
-                                 ul < cTableEntries;
-                                 ul++)
-                            {
-                                ULONG ulOfs = 0;
-
-                                _ultoa(ul + 1, szFind + 1, 10);
-                                while (xstrFindReplaceC(pstr,
-                                                        &ulOfs,
-                                                        szFind,
-                                                        pTable[ul]))
-                                    ;
-                            }
+                            ULONG ulOfs = 0;
+
+                            _ultoa(ul + 1, szFind + 1, 10);
+                            while (xstrFindReplaceC(pstr,
+                                                    &ulOfs,
+                                                    szFind,
+                                                    pTable[ul]))
+                                ;
                         }
                     }
                 }
             }
-
-            doshClose(&pFile);
         }
+
+        doshClose(&pFile);
     }
 

trunk/src/helpers/tree.c

@@ -218 +218 @@
  +                         p,                   // new tree node
  +                         fnCompare);          // comparison func
- +              return (p);
+ +              return p;
  +          }
  *
@@ -226 +226 @@
  +          int TREEENTRY fnCompare(ULONG ul1, ULONG ul2)
  +          {
- +              return (strcmp((const char*)ul1,
- +                             (const char*)ul2));
+ +              return strcmp((const char*)ul1,
+ +                            (const char*)ul2);
  +          }
  *
@@ -760 +760 @@
         (*plCount)--;       // V0.9.16 (2001-10-19) [umoeller]
 
-    return (STATUS_OK);
+    return STATUS_OK;
 }
 
@@ -999 +999 @@
     }
 
-    return (papNodes);
+    return papNodes;
 }
 

trunk/src/helpers/vcard.c

@@ -316 +316 @@
          || (!pllParent)
        )
-        return (ERROR_INVALID_PARAMETER);
+        return ERROR_INVALID_PARAMETER;
 
     while (!arc)

trunk/src/helpers/winh.c

@@ -120 +120 @@
     {
         // put the call in brackets so the macro won't apply here
-        return ((WinSendMsg)(hwnd, msg, mp1, mp2));
+        return (WinSendMsg)(hwnd, msg, mp1, mp2);
     }
 
@@ -138 +138 @@
     MRESULT winhSendDlgItemMsg(HWND hwnd, ULONG id, ULONG msg, MPARAM mp1, MPARAM mp2)
     {
-        return ((WinSendDlgItemMsg)(hwnd, id, msg, mp1, mp2));
+        return (WinSendDlgItemMsg)(hwnd, id, msg, mp1, mp2);
     }
 
@@ -157 +157 @@
     {
         // put the call in brackets so the macro won't apply here
-        return ((WinPostMsg)(hwnd, msg, mp1, mp2));
+        return (WinPostMsg)(hwnd, msg, mp1, mp2);
     }
 
@@ -169 +169 @@
     {
         // put the call in brackets so the macro won't apply here
-        return ((WinWindowFromID)(hwnd, id));
+        return (WinWindowFromID)(hwnd, id);
     }
 
@@ -181 +181 @@
     {
         // put the call in brackets so the macro won't apply here
-        return ((WinQueryWindow)(hwnd, lCode));
+        return (WinQueryWindow)(hwnd, lCode);
     }
 
@@ -193 +193 @@
     {
         // put the call in brackets so the macro won't apply here
-        return ((WinQueryWindowPtr)(hwnd, index));
+        return (WinQueryWindowPtr)(hwnd, index);
     }
 
@@ -2617 +2617 @@
     ULONG   ul = 0;
 
-    /* if (!WinIsWindowVisible(hwndDlg))
-        return (FALSE); */
-
     if ((pmpFlags) && (pxac))
     {

trunk/src/helpers/xml.c

@@ -176 +176 @@
         // start of expat (parser) errors
         case ERROR_EXPAT_NO_MEMORY:
-            return ("Out of memory");
+            return "Out of memory";
 
         case ERROR_EXPAT_SYNTAX:
-            return ("Syntax error");
+            return "Syntax error";
         case ERROR_EXPAT_NO_ELEMENTS:
-            return ("No element found");
+            return "No element found";
         case ERROR_EXPAT_INVALID_TOKEN:
-            return ("Not well-formed (invalid token)");
+            return "Not well-formed (invalid token)";
         case ERROR_EXPAT_UNCLOSED_TOKEN:
-            return ("Unclosed token");
+            return "Unclosed token";
         case ERROR_EXPAT_PARTIAL_CHAR:
-            return ("Unclosed token");
+            return "Unclosed token";
         case ERROR_EXPAT_TAG_MISMATCH:
-            return ("Mismatched tag");
+            return "Mismatched tag";
         case ERROR_EXPAT_DUPLICATE_ATTRIBUTE:
-            return ("Duplicate attribute");
+            return "Duplicate attribute";
         case ERROR_EXPAT_JUNK_AFTER_DOC_ELEMENT:
-            return ("Junk after root element");
+            return "Junk after root element";
         case ERROR_EXPAT_PARAM_ENTITY_REF:
-            return ("Illegal parameter entity reference");
+            return "Illegal parameter entity reference";
         case ERROR_EXPAT_UNDEFINED_ENTITY:
-            return ("Undefined entity");
+            return "Undefined entity";
         case ERROR_EXPAT_RECURSIVE_ENTITY_REF:
-            return ("Recursive entity reference");
+            return "Recursive entity reference";
         case ERROR_EXPAT_ASYNC_ENTITY:
-            return ("Asynchronous entity");
+            return "Asynchronous entity";
         case ERROR_EXPAT_BAD_CHAR_REF:
-            return ("Reference to invalid character number");
+            return "Reference to invalid character number";
         case ERROR_EXPAT_BINARY_ENTITY_REF:
-            return ("Reference to binary entity");
+            return "Reference to binary entity";
         case ERROR_EXPAT_ATTRIBUTE_EXTERNAL_ENTITY_REF:
-            return ("Reference to external entity in attribute");
+            return "Reference to external entity in attribute";
         case ERROR_EXPAT_MISPLACED_XML_PI:
-            return ("XML processing instruction not at start of external entity");
+            return "XML processing instruction not at start of external entity";
         case ERROR_EXPAT_UNKNOWN_ENCODING:
-            return ("Unknown encoding");
+            return "Unknown encoding";
         case ERROR_EXPAT_INCORRECT_ENCODING:
-            return ("Encoding specified in XML declaration is incorrect");
+            return "Encoding specified in XML declaration is incorrect";
         case ERROR_EXPAT_UNCLOSED_CDATA_SECTION:
-            return ("Unclosed CDATA section");
+            return "Unclosed CDATA section";
         case ERROR_EXPAT_EXTERNAL_ENTITY_HANDLING:
-            return ("Error in processing external entity reference");
+            return "Error in processing external entity reference";
         case ERROR_EXPAT_NOT_STANDALONE:
-            return ("Document is not standalone");
+            return "Document is not standalone";
         case ERROR_EXPAT_UNEXPECTED_STATE:
-            return ("Unexpected parser state - please send a bug report");
+            return "Unexpected parser state - please send a bug report";
         // end of expat (parser) errors
 
@@ -227 +227 @@
 
         case ERROR_DOM_UNDECLARED_ELEMENT:
-            return ("Element has not been declared");
+            return "Element has not been declared";
         case ERROR_DOM_ROOT_ELEMENT_MISNAMED:
-            return ("Root element name does not match DOCTYPE name");
+            return "Root element name does not match DOCTYPE name";
         case ERROR_DOM_INVALID_ROOT_ELEMENT:
-            return ("Invalid or duplicate root element");
+            return "Invalid or duplicate root element";
 
         case ERROR_DOM_INVALID_SUBELEMENT:
-            return ("Invalid sub-element in parent element");
+            return "Invalid sub-element in parent element";
         case ERROR_DOM_DUPLICATE_ELEMENT_DECL:
-            return ("Duplicate element declaration");
+            return "Duplicate element declaration";
         case ERROR_DOM_DUPLICATE_ATTRIBUTE_DECL:
-            return ("Duplicate attribute declaration");
+            return "Duplicate attribute declaration";
         case ERROR_DOM_UNDECLARED_ATTRIBUTE:
-            return ("Undeclared attribute in element");
+            return "Undeclared attribute in element";
         case ERROR_ELEMENT_CANNOT_HAVE_CONTENT:
-            return ("Element cannot have content");
+            return "Element cannot have content";
         case ERROR_DOM_INVALID_ATTRIB_VALUE:
-            return ("Invalid attribute value");
+            return "Invalid attribute value";
         case ERROR_DOM_REQUIRED_ATTRIBUTE_MISSING:
-            return ("Required attribute is missing");
+            return "Required attribute is missing";
         case ERROR_DOM_SUBELEMENT_IN_EMPTY_ELEMENT:
-            return ("Subelement in empty element");
+            return "Subelement in empty element";
 
         case ERROR_DOM_PARSING:
-            return ("Parsing error");
+            return "Parsing error";
         case ERROR_DOM_VALIDITY:
-            return ("Validity error");
+            return "Validity error";
 
         case ERROR_DOM_NODETYPE_NOT_SUPPORTED:
-            return ("DOM node type not supported");
+            return "DOM node type not supported";
         case ERROR_DOM_NO_DOCUMENT:
-            return ("No DOM document");
+            return "No DOM document";
         case ERROR_DOM_NO_ELEMENT:
-            return ("No DOM element");
+            return "No DOM element";
         case ERROR_DOM_DUPLICATE_DOCTYPE:
-            return ("Duplicate doctype");
+            return "Duplicate doctype";
         case ERROR_DOM_DOCTYPE_ROOT_NAMES_MISMATCH:
-            return ("Root element doesn't match doctype name");
+            return "Root element doesn't match doctype name";
         case ERROR_DOM_INTEGRITY:
-            return ("DOM integrity error");
+            return "DOM integrity error";
         case ERROR_DOM_DUPLICATE_ATTRIBUTE:
-            return ("Duplicate attribute");
+            return "Duplicate attribute";
 
         case ERROR_DOM_VALIDATE_INVALID_ELEMENT:
-            return ("Validation error: Undeclared element name");
+            return "Validation error: Undeclared element name";
         case ERROR_DOM_ELEMENT_DECL_OUTSIDE_DOCTYPE:
-            return ("Element declaration outside doctype");
+            return "Element declaration outside doctype";
         case ERROR_DOM_ATTLIST_DECL_OUTSIDE_DOCTYPE:
-            return ("Attlist declaration outside doctype");
+            return "Attlist declaration outside doctype";
 
         case ERROR_DOM_INCOMPLETE_ENCODING_MAP:
-            return ("Incomplete encoding map specified");
+            return "Incomplete encoding map specified";
 
         case ERROR_DOM_INVALID_EXTERNAL_HANDLER:
-            return ("Invalid 'external' handler specified");
+            return "Invalid 'external' handler specified";
     }
 
@@ -346 +346 @@
                                      ULONG ul2)
 {
-    return (strhcmp(((PXSTRING)ul1)->psz,
-                    ((PXSTRING)ul2)->psz));
+    return strhcmp(((PXSTRING)ul1)->psz,
+                   ((PXSTRING)ul2)->psz);
 }
 
@@ -1383 +1383 @@
     }
 
-    return (pStackItem);
+    return pStackItem;
 }
 
@@ -1482 +1482 @@
             }
             // return success
-            return (1);
+            return 1;
         }
     }
 
     // error
-    return (0);
+    return 0;
 }
 
@@ -2008 +2008 @@
     pDom->pParser = pOldParser;
 
-    return (i);
+    return i;
 }
 
@@ -2794 +2794 @@
     }
 
-    return (pElementDecl);
+    return pElementDecl;
 }
 
@@ -2818 +2818 @@
        )
     {
-        return ((PCMATTRIBUTEDECLBASE)treeFind(
-                                        pDocTypeNode->AttribDeclBasesTree,
-                                        (ULONG)pstrElementName,
-                                        CompareXStrings));
+        return (PCMATTRIBUTEDECLBASE)treeFind(pDocTypeNode->AttribDeclBasesTree,
+                                              (ULONG)pstrElementName,
+                                              CompareXStrings);
     }
 
@@ -2851 +2850 @@
         if (*ppAttribDeclBase)
         {
-            return ((PCMATTRIBUTEDECL)treeFind(
-                                         ((**ppAttribDeclBase).AttribDeclsTree),
-                                         (ULONG)pstrAttribName,
-                                         CompareXStrings));
+            return (PCMATTRIBUTEDECL)treeFind(((**ppAttribDeclBase).AttribDeclsTree),
+                                              (ULONG)pstrAttribName,
+                                              CompareXStrings);
         }
     }
@@ -2888 +2886 @@
             PDOMNODE pDomNode = (PDOMNODE)pListNode->pItemData;
             if (pDomNode->NodeBase.ulNodeType == DOMNODE_ELEMENT)
-                return (pDomNode);
+                return pDomNode;
 
             pListNode = pListNode->pNext;
@@ -2910 +2908 @@
     PLISTNODE pListNode = lstQueryFirstNode(&pDomNode->llChildren);
     if (pListNode)
-        return ((PDOMNODE)pListNode->pItemData);
-
-    return (0);
+        return (PDOMNODE)pListNode->pItemData;
+
+    return 0;
 }
 
@@ -2928 +2926 @@
     PLISTNODE pListNode = lstQueryLastNode(&pDomNode->llChildren);
     if (pListNode)
-        return ((PDOMNODE)pListNode->pItemData);
-
-    return (0);
+        return (PDOMNODE)pListNode->pItemData;
+
+    return 0;
 }
 
@@ -2953 +2951 @@
              && (pDomNodeThis->NodeBase.ulNodeType == DOMNODE_TEXT)
            )
-            return (pDomNodeThis);
+            return pDomNodeThis;
     }
 
@@ -3004 +3002 @@
 
         if (cItems)
-            return (pll);
-        else
-            lstFree(&pll);
-    }
-
-    return (0);
+            return pll;
+
+        lstFree(&pll);
+    }
+
+    return 0;
 }
 
@@ -3034 +3032 @@
                                        (ULONG)&str,
                                        CompareXStrings))
-        return (pAttrNode->pstrNodeValue);
+        return pAttrNode->pstrNodeValue;
 
     return NULL;

trunk/src/helpers/xprf2.c

@@ -644 +644 @@
 {
     printf("\r done %03d%%", ulNow * 100 / ulMax);
-    return (TRUE);
+    return TRUE;
 }