update for HEAD-2003021201

[reactos.git] / lib / msvcrt / stdlib / makepath.c

diff --git a/lib/msvcrt/stdlib/makepath.c b/lib/msvcrt/stdlib/makepath.c
index e61af37..fa04422 100644 (file)
--- a/lib/msvcrt/stdlib/makepath.c
+++ b/lib/msvcrt/stdlib/makepath.c
@@ -3,67 +3,30 @@
 #include <msvcrt/stdlib.h>
 #include <msvcrt/string.h>
 
-void _makepath(char *path, const char *drive, const char *dir, const char *fname, const char *ext)
+void _makepath(char* path, const char* drive, const char* dir, const char* fname, const char* ext)
 {
-  int dir_len;
+    int dir_len;
 
-  if ((drive != NULL) && (*drive))
-    {
-      strcpy(path, drive);
-      strcat(path, ":");
+    if ((drive != NULL) && (*drive)) {
+        strcpy(path, drive);
+        strcat(path, ":");
+    } else {
+        (*path)=0;
     }
-  else
-    (*path)=0;
 
-  if (dir != NULL)
-    {
-      strcat(path, dir);
-      dir_len = strlen(dir);
-      if (dir_len && *(dir + dir_len - 1) != '\\')
-       strcat(path, "\\");
+    if (dir != NULL) {
+        strcat(path, dir);
+        dir_len = strlen(dir);
+        if (dir_len && *(dir + dir_len - 1) != '\\')
+            strcat(path, "\\");
     }
 
-  if (fname != NULL)
-    {
-      strcat(path, fname);
-      if (ext != NULL && *ext != 0)
-       {
-         if (*ext != '.')
-           strcat(path, ".");
-       strcat(path, ext);
-       }
-    }
-}
-
-
-void _wmakepath(wchar_t *path, const wchar_t *drive, const wchar_t *dir, const wchar_t *fname, const wchar_t *ext)
-{
-  int dir_len;
-
-  if ((drive != NULL) && (*drive))
-    {
-      wcscpy(path, drive);
-      wcscat(path, L":");
-    }
-  else
-    (*path)=0;
-
-  if (dir != NULL)
-    {
-      wcscat(path, dir);
-      dir_len = wcslen(dir);
-      if (dir_len && *(dir + dir_len - 1) != L'\\')
-       wcscat(path, L"\\");
-    }
-
-  if (fname != NULL)
-    {
-      wcscat(path, fname);
-      if (ext != NULL && *ext != 0)
-       {
-         if (*ext != L'.')
-           wcscat(path, L".");
-         wcscat(path, ext);
-       }
+    if (fname != NULL) {
+        strcat(path, fname);
+        if (ext != NULL && *ext != 0) {
+            if (*ext != '.')
+                strcat(path, ".");
+            strcat(path, ext);
+        }
     }
 }