[ros-diffs] [reactos] 01/01: [DISKPART] Get rid of PrintMessageString()

[Eric Kohl]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca51f000495325be751532...

commit ca51f000495325be75153238309cd4595a1e6d0a
Author:     Eric Kohl [e-mail]
AuthorDate: Wed Jun 1 00:46:45 2022 +0200
Commit:     Eric Kohl [e-mail]
CommitDate: Wed Jun 1 00:46:45 2022 +0200

[DISKPART] Get rid of PrintMessageString()
---
 base/system/diskpart/diskpart.h |  4 ----
 base/system/diskpart/help.c     | 12 ++++++++++--
 base/system/diskpart/misc.c     | 12 ------------
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/base/system/diskpart/diskpart.h b/base/system/diskpart/diskpart.h
index e3b4c247861..755dc7b44c4 100644
--- a/base/system/diskpart/diskpart.h
+++ b/base/system/diskpart/diskpart.h
@@ -392,10 +392,6 @@ RoundingDivide(
     _In_ ULONGLONG Dividend,
     _In_ ULONGLONG Divisor);

-VOID
-PrintMessageString(
-    _In_ DWORD dwMessage);
-
 /* offline.c */
 BOOL offline_main(INT argc, LPWSTR *argv);

diff --git a/base/system/diskpart/help.c b/base/system/diskpart/help.c
index f2a23960ae0..2caf271e5f2 100644
--- a/base/system/diskpart/help.c
+++ b/base/system/diskpart/help.c
@@ -89,7 +89,11 @@ HelpCommand(
                 (wcsicmp(pCommand->cmd3, cmdptr->cmd3) == 0) &&
                 (cmdptr->help_detail != MSG_NONE))
             {
-                PrintMessageString(cmdptr->help_detail);
+                ConMsgPuts(StdOut,
+                           FORMAT_MESSAGE_FROM_HMODULE,
+                           NULL,
+                           cmdptr->help_detail,
+                           LANG_USER_DEFAULT);
                 bSubCommands = TRUE;
             }
         }
@@ -97,7 +101,11 @@ HelpCommand(

if ((bSubCommands == FALSE) && (pCommand->help_detail != MSG_NONE))
     {
-        PrintMessageString(pCommand->help_detail);
+        ConMsgPuts(StdOut,
+                   FORMAT_MESSAGE_FROM_HMODULE,
+                   NULL,
+                   pCommand->help_detail,
+                   LANG_USER_DEFAULT);
     }

ConPuts(StdOut, L"\n");
diff --git a/base/system/diskpart/misc.c b/base/system/diskpart/misc.c
index ddb2946a840..b46651b670b 100644
--- a/base/system/diskpart/misc.c
+++ b/base/system/diskpart/misc.c
@@ -78,15 +78,3 @@ RoundingDivide(
 {
     return (Dividend + Divisor / 2) / Divisor;
 }
-
-
-VOID
-PrintMessageString(
-    _In_ DWORD dwMessage)
-{
-    ConMsgPuts(StdOut,
-               FORMAT_MESSAGE_FROM_HMODULE,
-               NULL, //hModuleNetMsg,
-               dwMessage,
-               LANG_USER_DEFAULT);
-}