[ros-diffs] [fireball] 35067: - Revert my no_change_list modification, it turns out it's not needed, since when write_immed is set, changes aren't added to the list.

[fireball at svn.reactos.org]

Author: fireball
Date: Sun Aug  3 07:50:10 2008
New Revision: 35067

URL: http://svn.reactos.org/svn/reactos?rev=35067&view=rev
Log:
- Revert my no_change_list modification, it turns out it's not needed, since when write_immed is set, changes aren't added to the list.

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

Modified: trunk/rosapps/applications/sysutils/dosfsck/dosfsck.c
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/dosfsck/dosfsck.c?rev=35067&r1=35066&r2=35067&view=diff
==============================================================================
--- trunk/rosapps/applications/sysutils/dosfsck/dosfsck.c [iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/dosfsck/dosfsck.c [iso-8859-1] Sun Aug  3 07:50:10 2008
@@ -24,7 +24,7 @@
 #include "check.h"
 
 
-int interactive = 0,list = 0,test = 0,verbose = 0,write_immed = 0,no_change_list=0;
+int interactive = 0,list = 0,test = 0,verbose = 0,write_immed = 0;
 int atari_format = 0;
 unsigned n_files = 0;
 void *mem_queue = NULL;

Modified: trunk/rosapps/applications/sysutils/dosfsck/dosfsck.h
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/dosfsck/dosfsck.h?rev=35067&r1=35066&r2=35067&view=diff
==============================================================================
--- trunk/rosapps/applications/sysutils/dosfsck/dosfsck.h [iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/dosfsck/dosfsck.h [iso-8859-1] Sun Aug  3 07:50:10 2008
@@ -162,7 +162,7 @@
 #define offsetof(t,e)	((int)&(((t *)0)->e))
 #endif
 
-extern int interactive,list,verbose,test,write_immed,no_change_list;
+extern int interactive,list,verbose,test,write_immed;
 extern int atari_format;
 extern unsigned n_files;
 extern void *mem_queue;

Modified: trunk/rosapps/applications/sysutils/dosfsck/io.c
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/dosfsck/io.c?rev=35067&r1=35066&r2=35067&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:50:10 2008
@@ -194,16 +194,14 @@
         die("Wrote %d bytes instead of %d at %I64d",did,size,pos);
     }
 
-    if (!no_change_list)
-    {
-        new = alloc(sizeof(CHANGE));
-        new->pos = pos;
-        memcpy(new->data = alloc(new->size = size),data,size);
-        new->next = NULL;
-        if (last) last->next = new;
-        else changes = new;
-        last = new;
-    }
+    new = alloc(sizeof(CHANGE));
+    new->pos = pos;
+    memcpy(new->data = alloc(new->size = size),data,size);
+    new->next = NULL;
+    if (last) last->next = new;
+    else changes = new;
+    last = new;
+
 #else //SAE
     if (write_immed) {
 	did_change = 1;
@@ -230,7 +228,6 @@
     int old_write_immed = write_immed;
 
     /* Disable writes to the list now */
-    no_change_list = 1;
     write_immed = 1;
 
     while (changes) {
@@ -255,7 +252,6 @@
     }
 
     /* Restore values */
-    no_change_list = 0;
     write_immed = old_write_immed;
 }