Changeset 184 for trunk/src/helpers/cnrh.c

Timestamp:

Jul 5, 2002, 9:13:36 AM (23 years ago)

Author:

umoeller

Message:

Second round of fixes for 0.9.19.

File:

• trunk/src/helpers/cnrh.c (modified) (22 diffs)

trunk/src/helpers/cnrh.c

@@ -96 +96 @@
         ulFlags |= CMA_INVALIDATE;
 
-    return (ULONG)(WinSendMsg(hwndCnr,
-                              CM_REMOVEDETAILFIELDINFO,
-                              (MPARAM)NULL,
-                              MPFROM2SHORT(0,      // all
-                                           ulFlags)));
+    return (ULONG)WinSendMsg(hwndCnr,
+                             CM_REMOVEDETAILFIELDINFO,
+                             (MPARAM)NULL,
+                             MPFROM2SHORT(0,      // all
+                                          ulFlags));
 }
 
@@ -218 +218 @@
     fii.cFieldInfoInsert = ulFieldCount;
 
-    return ((ULONG)WinSendMsg(hwndCnr,
-                              CM_INSERTDETAILFIELDINFO,
-                              (MPARAM)pFieldInfoFirst,
-                              (MPARAM)&fii));
+    return (ULONG)WinSendMsg(hwndCnr,
+                             CM_INSERTDETAILFIELDINFO,
+                             (MPARAM)pFieldInfoFirst,
+                             (MPARAM)&fii);
 }
 
@@ -348 +348 @@
     }
 
-    return (pFieldInfoReturn);
+    return pFieldInfoReturn;
 }
 
@@ -395 +395 @@
                              ULONG ulCount)  // in: number of records to allocate (> 0)
 {
-    PRECORDCORE      precc;
-    precc = (PRECORDCORE)WinSendMsg(hwndCnr,
-                                    CM_ALLOCRECORD,
-                                    (MPARAM)(cbrecc-sizeof(RECORDCORE)),
-                                    (MPARAM)ulCount);
-
-    return (precc);
+    return (PRECORDCORE)WinSendMsg(hwndCnr,
+                                   CM_ALLOCRECORD,
+                                   (MPARAM)(cbrecc - sizeof(RECORDCORE)),
+                                   (MPARAM)ulCount);
 }
 
@@ -478 +475 @@
                         ULONG ulCount)  // in: number of records to insert (> 0)
 {
-    ULONG           ulrc = 0;
     RECORDINSERT    ri;
 
@@ -503 +499 @@
         ri.cRecordsInsert = ulCount;        // V0.9.0
 
-        ulrc = (ULONG)WinSendMsg(hwndCnr,
+        return (ULONG)WinSendMsg(hwndCnr,
                                  CM_INSERTRECORD,
                                  (MPARAM)precc,
                                  (MPARAM)&ri);
     }
-    return (ulrc);
+
+    return 0;
 }
 
@@ -528 +525 @@
                             BOOL fInvalidate)           // in: invalidate records?
 {
-    ULONG           ulrc = 0;
     RECORDINSERT    ri;
 
@@ -552 +548 @@
             ri.cRecordsInsert = 1;
 
-            ulrc = (ULONG)WinSendMsg(hwndCnr,
+            return (ULONG)WinSendMsg(hwndCnr,
                                      CM_INSERTRECORD,
                                      (MPARAM)precc,
@@ -558 +554 @@
         }
     }
-    return (ulrc);
+
+    return 0;
 }
 
@@ -608 +605 @@
         return (ulrc != 0);
     }
-    else return (FALSE);
+
+    return FALSE;
 }
 
@@ -807 +805 @@
     } while (TRUE);
 
-    return (ulrc);
+    return ulrc;
 }
 
@@ -946 +944 @@
     //     _Pmpf(("  CM_QUERYVIEWPORTRECT failed."));
 
-    return (preccReturn);
+    return preccReturn;
 }
 
@@ -979 +977 @@
     }
 
-    return (ul);
+    return ul;
 }
 
@@ -1387 +1385 @@
     }
 
-    return (preccReturn);
+    return preccReturn;
 }
 
@@ -1416 +1414 @@
             preccReturn = preccNext;
     }
-    return (preccReturn);
+
+    return preccReturn;
 }
 
@@ -1485 +1484 @@
     }
 
-    return (lrc);
+    return lrc;
 }
 
@@ -1642 +1641 @@
     }
 
-    return (ulrc);
+    return ulrc;
 }
 
@@ -1773 +1772 @@
     if (hwndFrame)
     {
-        henum = WinBeginEnumWindows(hwndFrame);
-        if (henum)
+        if (henum = WinBeginEnumWindows(hwndFrame))
         {
             do
             {
-                hwndTemp = WinGetNextWindow(henum);
-                if (hwndTemp)
+                if (hwndTemp = WinGetNextWindow(henum))
                 {
                     if (WinQueryClassName(hwndTemp, 250, szClassName))
@@ -2001 +1998 @@
     } // end if (pdrgInfo)
 
-    return (pdrgInfo);
+    return pdrgInfo;
 }
 
@@ -2183 +2180 @@
             pctime->hours = pdt->hours;
         }
-        return (TRUE);
+        return TRUE;
     }
-    else
-        return (FALSE);
+
+    return FALSE;
 }
 
@@ -2203 +2200 @@
         pcd->month = pfd->month;
         pcd->year = pfd->year + 1980;
-        return (TRUE);
+        return TRUE;
     }
-    else
-        return (FALSE);
+
+    return FALSE;
 }
 
@@ -2224 +2221 @@
         pct->hours = pft->hours;
         pct->ucReserved = 0;
-        return (TRUE);
+        return TRUE;
     }
-    else
-        return (FALSE);
-}
+
+    return FALSE;
+}