[ros-diffs] [tfaber] 69111: [FATTEN] - Fix VC2010 build

Author: tfaber
Date: Tue Sep  8 08:27:00 2015
New Revision: 69111

URL: http://svn.reactos.org/svn/reactos?rev=69111&view=rev
Log:
[FATTEN]
- Fix VC2010 build

Modified:
    trunk/reactos/tools/fatten/fatten.c

Modified: trunk/reactos/tools/fatten/fatten.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/fatten/fatten.c?rev=…
==============================================================================
--- trunk/reactos/tools/fatten/fatten.c	[iso-8859-1] (original)
+++ trunk/reactos/tools/fatten/fatten.c	[iso-8859-1] Tue Sep  8 08:27:00 2015
@@ -29,6 +29,7 @@
     time(&rawtime);
     timeinfo = localtime(&rawtime);
 
+    {
     union FatTime {
         struct {
             DWORD Second : 5; // div 2
@@ -51,6 +52,7 @@
     };
 
     return myTime.whole;
+    }
 }
 
 int is_command(const char* parg)
@@ -66,10 +68,12 @@
 
 int need_mount()
 {
+    int r;
+
     if (isMounted)
         return FR_OK;
 
-    int r = f_mount(&g_Filesystem, "0:", 0);
+    r = f_mount(&g_Filesystem, "0:", 0);
     if (r)
         return r;
 
@@ -116,6 +120,8 @@
     while (argc > 0)
     {
         char *parg = *argv;
+        int nargs = 0;
+        int i = 0;
 
         if (!is_command(parg))
         {
@@ -128,21 +134,20 @@
         argc--;
 
         // find next command, to calculare number of args
-        int nargs = 0;
-        int i = 0;
         while ((argv[i] != NULL) && !is_command(argv[i++]))
             nargs++;
 
         if (strcmp(parg, "format") == 0)
         {
             // NOTE: The fs driver detects which FAT format fits best based on size
+            int sectors;
 
             NEED_PARAMS(1, 1);
 
             NEED_MOUNT();
 
             // Arg 1: number of sectors
-            int sectors = atoi(argv[0]);
+            sectors = atoi(argv[0]);
 
             if (sectors <= 0)
             {
@@ -168,34 +173,33 @@
         }
         else if (strcmp(parg, "add") == 0)
         {
-            NEED_PARAMS(2, 2);
-
-            NEED_MOUNT();
-
-            // Arg 1: external file to add
-            // Arg 2: virtual filename
-
             FILE* fe;
             FIL   fv = { 0 };
-
-            fe = fopen(argv[0], "rb");
-
-            if (!fe)
-            {
-                printf("Error: unable to open external file '%s' for
reading.", argv[0]);
-                return 1;
-            }
-
-            if (f_open(&fv, argv[1], FA_WRITE | FA_CREATE_ALWAYS))
-            {
-                printf("Error: unable to open file '%s' for writing.",
argv[1]);
-                return 1;
-            }
-
             char buff[32768];
             UINT rdlen = 0;
             UINT wrlen = 0;
 
+            NEED_PARAMS(2, 2);
+
+            NEED_MOUNT();
+
+            // Arg 1: external file to add
+            // Arg 2: virtual filename
+
+            fe = fopen(argv[0], "rb");
+
+            if (!fe)
+            {
+                printf("Error: unable to open external file '%s' for
reading.", argv[0]);
+                return 1;
+            }
+
+            if (f_open(&fv, argv[1], FA_WRITE | FA_CREATE_ALWAYS))
+            {
+                printf("Error: unable to open file '%s' for writing.",
argv[1]);
+                return 1;
+            }
+
             while ((rdlen = fread(buff, 1, 32768, fe)) > 0)
             {
                 f_write(&fv, buff, rdlen, &wrlen);
@@ -206,34 +210,33 @@
         }
         else if (strcmp(parg, "extract") == 0)
         {
-            NEED_PARAMS(2, 2);
-
-            NEED_MOUNT();
-
-            // Arg 1: virtual file to extract
-            // Arg 2: external filename
-
             FIL   fe = { 0 };
             FILE* fv;
-
-            if (f_open(&fe, argv[0], FA_READ))
-            {
-                printf("Error: unable to open file '%s' for reading.",
argv[0]);
-                return 1;
-            }
-
-            fv = fopen(argv[1], "wb");
-
-            if (!fv)
-            {
-                printf("Error: unable to open external file '%s' for
writing.", argv[1]);
-                return 1;
-            }
-
             char buff[32768];
             UINT rdlen = 0;
             UINT wrlen = 0;
 
+            NEED_PARAMS(2, 2);
+
+            NEED_MOUNT();
+
+            // Arg 1: virtual file to extract
+            // Arg 2: external filename
+
+            if (f_open(&fe, argv[0], FA_READ))
+            {
+                printf("Error: unable to open file '%s' for reading.",
argv[0]);
+                return 1;
+            }
+
+            fv = fopen(argv[1], "wb");
+
+            if (!fv)
+            {
+                printf("Error: unable to open external file '%s' for
writing.", argv[1]);
+                return 1;
+            }
+
             while ((f_read(&fe, buff, 32768, &rdlen) == 0) && (rdlen >
0))
             {
                 fwrite(buff, 1, rdlen, fv);
@@ -255,30 +258,29 @@
         }
         else if (strcmp(parg, "copy") == 0)
         {
-            NEED_PARAMS(2, 2);
-
-            NEED_MOUNT();
-            // Arg 1: src path & filename
-            // Arg 2: new path & filename
-
             FIL fe = { 0 };
             FIL fv = { 0 };
-
-            if (f_open(&fe, argv[0], FA_READ))
-            {
-                printf("Error: unable to open file '%s' for reading.",
argv[0]);
-                return 1;
-            }
-            if (f_open(&fv, argv[1], FA_WRITE | FA_CREATE_ALWAYS))
-            {
-                printf("Error: unable to open file '%s' for writing.",
argv[1]);
-                return 1;
-            }
-
             char buff[32768];
             UINT rdlen = 0;
             UINT wrlen = 0;
 
+            NEED_PARAMS(2, 2);
+
+            NEED_MOUNT();
+            // Arg 1: src path & filename
+            // Arg 2: new path & filename
+
+            if (f_open(&fe, argv[0], FA_READ))
+            {
+                printf("Error: unable to open file '%s' for reading.",
argv[0]);
+                return 1;
+            }
+            if (f_open(&fv, argv[1], FA_WRITE | FA_CREATE_ALWAYS))
+            {
+                printf("Error: unable to open file '%s' for writing.",
argv[1]);
+                return 1;
+            }
+
             while ((f_read(&fe, buff, 32768, &rdlen) == 0) && (rdlen >
0))
             {
                 f_write(&fv, buff, rdlen, &wrlen);
@@ -307,28 +309,28 @@
         }
         else if (strcmp(parg, "list") == 0)
         {
-            NEED_PARAMS(0, 1);
-
-            // Arg 1: folder path (optional)
             char* root = "/";
-
-            if (nargs == 1)
-            {
-                root = argv[0];
-            }
-
             DIR dir = { 0 };
-
-            if (f_opendir(&dir, root))
-            {
-                printf("Error opening directory '%s'.\n", root);
-                return 1;
-            }
-
-            printf("Listing directory contents of: %s\n", root);
-
             FILINFO info = { 0 };
             char lfname[257];
+
+            NEED_PARAMS(0, 1);
+
+            // Arg 1: folder path (optional)
+
+            if (nargs == 1)
+            {
+                root = argv[0];
+            }
+
+            if (f_opendir(&dir, root))
+            {
+                printf("Error opening directory '%s'.\n", root);
+                return 1;
+            }
+
+            printf("Listing directory contents of: %s\n", root);
+
             info.lfname = lfname;
             info.lfsize = 256;
             while ((!f_readdir(&dir, &info)) && (strlen(info.fname) >
0))