[FSLIB]

- Don't call the callback if the caller didn't give one

svn path=/trunk/; revision=54268

diff --git a/reactos/lib/fslib/ext2lib/Mke2fs.c b/reactos/lib/fslib/ext2lib/Mke2fs.c
index 6c64bc6..fbca61b 100644 (file)
--- a/reactos/lib/fslib/ext2lib/Mke2fs.c
+++ b/reactos/lib/fslib/ext2lib/Mke2fs.c
@@ -820,7 +820,10 @@ Ext2Format(IN PUNICODE_STRING DriveRoot,
     ULONG ret_blk;
 
 
-    Callback(PROGRESS, 0, (PVOID)&Percent);
+    if (Callback != NULL)
+    {
+        Callback(PROGRESS, 0, (PVOID)&Percent);
+    }
 
 
     RtlZeroMemory(&Ext2Sb, sizeof(EXT2_SUPER_BLOCK));
@@ -997,7 +1000,10 @@ clean_up:
 
     Ext2CloseDevice(&FileSys);
 
-    Callback(DONE, 0, (PVOID)&bRet);
+    if (Callback != NULL)
+    {
+        Callback(DONE, 0, (PVOID)&bRet);
+    }
 
     return Status;
 }

diff --git a/reactos/lib/fslib/vfatlib/vfatlib.c b/reactos/lib/fslib/vfatlib/vfatlib.c
index f3b0146..804cd0a 100644 (file)
--- a/reactos/lib/fslib/vfatlib/vfatlib.c
+++ b/reactos/lib/fslib/vfatlib/vfatlib.c
@@ -294,7 +294,10 @@ UpdateProgress(PFORMAT_CONTEXT Context,
     if (NewPercent > Context->Percent)
     {
         Context->Percent = NewPercent;
-        Context->Callback (PROGRESS, 0, &Context->Percent);
+        if (Context->Callback != NULL)
+        {
+            Context->Callback (PROGRESS, 0, &Context->Percent);
+        }
     }
 }
 

diff --git a/reactos/lib/fslib/vfatxlib/vfatxlib.c b/reactos/lib/fslib/vfatxlib/vfatxlib.c
index 845c7a7..62a7e62 100644 (file)
--- a/reactos/lib/fslib/vfatxlib/vfatxlib.c
+++ b/reactos/lib/fslib/vfatxlib/vfatxlib.c
@@ -169,7 +169,10 @@ VfatxUpdateProgress(IN PFORMAT_CONTEXT Context,
     if (NewPercent > Context->Percent)
     {
         Context->Percent = NewPercent;
-        Context->Callback(PROGRESS, 0, &Context->Percent);
+        if (Context->Callback != NULL)
+        {
+            Context->Callback(PROGRESS, 0, &Context->Percent);
+        }
     }
 }