[ros-diffs] [fireball] 35066: - Fix warnings in io.c.

[fireball at svn.reactos.org]

Author: fireball
Date: Sun Aug  3 07:46:43 2008
New Revision: 35066

URL: http://svn.reactos.org/svn/reactos?rev=35066&view=rev
Log:
- Fix warnings in io.c.

Modified:
    trunk/rosapps/applications/sysutils/dosfsck/io.c

Modified: trunk/rosapps/applications/sysutils/dosfsck/io.c
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/dosfsck/io.c?rev=35066&r1=35065&r2=35066&view=diff
==============================================================================
--- trunk/rosapps/applications/sysutils/dosfsck/io.c [iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/dosfsck/io.c [iso-8859-1] Sun Aug  3 07:46:43 2008
@@ -68,7 +68,7 @@
 #endif
 #define llseek	WIN32llseek
 
-static int is_device = 0;
+//static int is_device = 0;
 
 void fs_open(char *path,int rw)
 {
@@ -139,8 +139,6 @@
 #if 1 // TMN
 	const size_t readsize_aligned = (size % 512) ? (size + (512 - (size % 512))) : size;        // TMN:
 	const loff_t seekpos_aligned = pos - (pos % 512);                   // TMN:
-	const size_t seek_delta = (size_t)(pos - seekpos_aligned);          // TMN:
-	const size_t readsize = (size_t)(pos - seekpos_aligned) + readsize_aligned; // TMN:
     scratch = alloc(readsize_aligned);
     if (llseek(fd,seekpos_aligned,0) != seekpos_aligned) pdie("Seek to %lld",pos);
     okay = read(fd,scratch,readsize_aligned) == (int)readsize_aligned;
@@ -166,7 +164,6 @@
         const size_t readsize_aligned = (size % 512) ? (size + (512 - (size % 512))) : size;
         const loff_t seekpos_aligned = pos - (pos % 512);
         const size_t seek_delta = (size_t)(pos - seekpos_aligned);
-        const size_t readsize = (size_t)(pos - seekpos_aligned) + readsize_aligned;
         boolean use_read = (seek_delta != 0) || ((readsize_aligned-size) != 0);
 
         /* Aloc temp buffer if write is not aligned */
@@ -184,7 +181,7 @@
             if (read(fd,scratch,readsize_aligned) < 0) pdie("Read %d bytes at %I64d",size,pos);
 
             /* Patch data in memory */
-            memcpy(data, scratch+seek_delta, size);
+            memcpy(data, (char *)scratch+seek_delta, size);
         }
 
         /* Write it back */
@@ -229,7 +226,7 @@
 static void fs_flush(void)
 {
     CHANGE *this;
-    int size;
+    //int size;
     int old_write_immed = write_immed;
 
     /* Disable writes to the list now */
@@ -300,9 +297,9 @@
 static int WIN32open(const char *path, int oflag, ...)
 {
 	HANDLE fh;
-	DWORD desiredAccess;
-	DWORD shareMode;
-	DWORD creationDisposition;
+	DWORD desiredAccess = 0;
+	DWORD shareMode = 0;
+	DWORD creationDisposition = 0;
 	DWORD flagsAttributes = FILE_ATTRIBUTE_NORMAL;
 	SECURITY_ATTRIBUTES securityAttributes;
 	va_list ap;