From 2bcf27a7d0a8bb6138dfdf952e88649bb5f38550 Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Wed, 20 Sep 2017 07:50:48 +0000 Subject: [PATCH] [FSUTIL] Define handlers type svn path=/trunk/; revision=75909 --- reactos/base/applications/cmdutils/fsutil/dirty.c | 4 ++-- reactos/base/applications/cmdutils/fsutil/fsinfo.c | 6 +++--- reactos/base/applications/cmdutils/fsutil/fsutil.c | 6 +++--- reactos/base/applications/cmdutils/fsutil/fsutil.h | 5 ++++- reactos/base/applications/cmdutils/fsutil/hardlink.c | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/reactos/base/applications/cmdutils/fsutil/dirty.c b/reactos/base/applications/cmdutils/fsutil/dirty.c index ac6f12ccf2a..e5fabb3ab35 100644 --- a/reactos/base/applications/cmdutils/fsutil/dirty.c +++ b/reactos/base/applications/cmdutils/fsutil/dirty.c @@ -10,8 +10,8 @@ #include /* Add handlers here for subcommands */ -static int QueryMain(int argc, const TCHAR *argv[]); -static int SetMain(int argc, const TCHAR *argv[]); +static HandlerProc QueryMain; +static HandlerProc SetMain; static HandlerItem HandlersList[] = { /* Proc, name, help */ diff --git a/reactos/base/applications/cmdutils/fsutil/fsinfo.c b/reactos/base/applications/cmdutils/fsutil/fsinfo.c index f7ef8e4ccf5..bf2aeaa1bb5 100644 --- a/reactos/base/applications/cmdutils/fsutil/fsinfo.c +++ b/reactos/base/applications/cmdutils/fsutil/fsinfo.c @@ -9,9 +9,9 @@ #include "fsutil.h" /* Add handlers here for subcommands */ -static int DrivesMain(int argc, const TCHAR *argv[]); -static int DriveTypeMain(int argc, const TCHAR *argv[]); -static int VolumeInfoMain(int argc, const TCHAR *argv[]); +static HandlerProc DrivesMain; +static HandlerProc DriveTypeMain; +static HandlerProc VolumeInfoMain; static HandlerItem HandlersList[] = { /* Proc, name, help */ diff --git a/reactos/base/applications/cmdutils/fsutil/fsutil.c b/reactos/base/applications/cmdutils/fsutil/fsutil.c index 1f296c2f7b6..77d1cf23cd0 100644 --- a/reactos/base/applications/cmdutils/fsutil/fsutil.c +++ b/reactos/base/applications/cmdutils/fsutil/fsutil.c @@ -9,9 +9,9 @@ #include "fsutil.h" /* Add handlers here for commands */ -int DirtyMain(int argc, const TCHAR *argv[]); -int FsInfoMain(int argc, const TCHAR *argv[]); -int HardLinkMain(int argc, const TCHAR *argv[]); +HandlerProc DirtyMain; +HandlerProc FsInfoMain; +HandlerProc HardLinkMain; static HandlerItem HandlersList[] = { /* Proc, name, help */ diff --git a/reactos/base/applications/cmdutils/fsutil/fsutil.h b/reactos/base/applications/cmdutils/fsutil/fsutil.h index 0971f1e216f..55e27d1375d 100644 --- a/reactos/base/applications/cmdutils/fsutil/fsutil.h +++ b/reactos/base/applications/cmdutils/fsutil/fsutil.h @@ -5,9 +5,12 @@ #include #include +typedef int (HandlerProc)(int argc, const TCHAR *argv[]); +typedef HandlerProc * pHandlerProc; + typedef struct { - int (*Handler)(int argc, const TCHAR *argv[]); + pHandlerProc Handler; const TCHAR * Command; const TCHAR * Desc; } HandlerItem; diff --git a/reactos/base/applications/cmdutils/fsutil/hardlink.c b/reactos/base/applications/cmdutils/fsutil/hardlink.c index d7b57c29490..b9bc306127c 100644 --- a/reactos/base/applications/cmdutils/fsutil/hardlink.c +++ b/reactos/base/applications/cmdutils/fsutil/hardlink.c @@ -9,7 +9,7 @@ #include "fsutil.h" /* Add handlers here for subcommands */ -static int CreateMain(int argc, const TCHAR *argv[]); +static HandlerProc CreateMain; static HandlerItem HandlersList[] = { /* Proc, name, help */