Changeset 238 for trunk/src/helpers/dosh2.c

Timestamp:

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

Author:

umoeller

Message:

Misc fixes.

File:

• trunk/src/helpers/dosh2.c (modified) (10 diffs)

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