Changeset 122 for trunk/src/helpers/dosh.c

Timestamp:

Dec 8, 2001, 11:14:27 PM (24 years ago)

Author:

umoeller

Message:

Misc changes.

File:

• trunk/src/helpers/dosh.c (modified) (4 diffs)

trunk/src/helpers/dosh.c

@@ -1837 +1837 @@
  *@@added V0.9.16 (2001-10-19) [umoeller]
  *@@changed V0.9.16 (2001-12-02) [umoeller]: added XOPEN_BINARY \r\n support
+ *@@changed V0.9.16 (2001-12-06) [umoeller]: added check for pFile != NULL
  */
 
@@ -1844 +1845 @@
 {
     APIRET arc = NO_ERROR;
-    if (!pcsz)
+    if ((!pFile) || (!pcsz))
         arc = ERROR_INVALID_PARAMETER;
     else
@@ -1930 +1931 @@
  *      The internal string buffer is limited to 2000
  *      characters. Length checking is _not_ performed.
+ *
+ *@@added V0.9.16 (2001-10-19) [umoeller]
+ *@@changed V0.9.16 (2001-12-06) [umoeller]: added check for pFile != NULL
  */
 
@@ -1936 +1940 @@
                          ...)
 {
-    APIRET arc;
-
-    DATETIME dt;
-    CHAR szTemp[2000];
-    ULONG   ulLength;
-
-    DosGetDateTime(&dt);
-    if (ulLength = sprintf(szTemp,
-                           "%04d-%02d-%02d %02d:%02d:%02d:%02d ",
-                           dt.year, dt.month, dt.day,
-                           dt.hours, dt.minutes, dt.seconds, dt.hundredths))
-    {
-        if (!(arc = doshWrite(pFile,
-                              szTemp,
-                              ulLength)))
+    APIRET arc = NO_ERROR;
+
+    if ((!pFile) || (!pcszFormat))
+        arc = ERROR_INVALID_PARAMETER;
+    else
+    {
+        DATETIME dt;
+        CHAR szTemp[2000];
+        ULONG   ulLength;
+
+        DosGetDateTime(&dt);
+        if (ulLength = sprintf(szTemp,
+                               "%04d-%02d-%02d %02d:%02d:%02d:%02d ",
+                               dt.year, dt.month, dt.day,
+                               dt.hours, dt.minutes, dt.seconds, dt.hundredths))
         {
-            va_list arg_ptr;
-            va_start(arg_ptr, pcszFormat);
-            ulLength = vsprintf(szTemp, pcszFormat, arg_ptr);
-            va_end(arg_ptr);
-
-            if (pFile->flOpenMode & XOPEN_BINARY)
-                // if we're in binary mode, we need to add \r too
-                szTemp[ulLength++] = '\r';
-            szTemp[ulLength++] = '\n';
-
-            arc = doshWrite(pFile,
-                            (PCSZ)szTemp,
-                            ulLength);
+            if (!(arc = doshWrite(pFile,
+                                  szTemp,
+                                  ulLength)))
+            {
+                va_list arg_ptr;
+                va_start(arg_ptr, pcszFormat);
+                ulLength = vsprintf(szTemp, pcszFormat, arg_ptr);
+                va_end(arg_ptr);
+
+                if (pFile->flOpenMode & XOPEN_BINARY)
+                    // if we're in binary mode, we need to add \r too
+                    szTemp[ulLength++] = '\r';
+                szTemp[ulLength++] = '\n';
+
+                arc = doshWrite(pFile,
+                                (PCSZ)szTemp,
+                                ulLength);
+            }
         }
     }