From daaf78f524e84632060742d43016a54da7f6ac20 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sat, 29 Oct 2011 15:03:01 +0000 Subject: [PATCH] [FSLIB] - Don't call the callback if the caller didn't give one svn path=/trunk/; revision=54268 --- reactos/lib/fslib/ext2lib/Mke2fs.c | 10 ++++++++-- reactos/lib/fslib/vfatlib/vfatlib.c | 5 ++++- reactos/lib/fslib/vfatxlib/vfatxlib.c | 5 ++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/reactos/lib/fslib/ext2lib/Mke2fs.c b/reactos/lib/fslib/ext2lib/Mke2fs.c index 6c64bc6f037..fbca61b03a9 100644 --- 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 f3b01462930..804cd0a2025 100644 --- 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 845c7a73532..62a7e6236e2 100644 --- 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); + } } }