From 71b471e27e1182a4170159a5ffd4dc5e4d04d6ce Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sun, 16 Nov 2014 10:34:49 +0000 Subject: [PATCH] [NET] Replace remaining hard coded 'padding' strings. svn path=/trunk/; revision=65418 --- .../applications/network/net/cmdLocalGroup.c | 8 +++++--- reactos/base/applications/network/net/cmdUser.c | 7 ++++--- reactos/base/applications/network/net/main.c | 16 ++++++++++++++++ reactos/base/applications/network/net/net.h | 5 +++++ 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/reactos/base/applications/network/net/cmdLocalGroup.c b/reactos/base/applications/network/net/cmdLocalGroup.c index 8c05530c2c3..77de18b9f09 100644 --- a/reactos/base/applications/network/net/cmdLocalGroup.c +++ b/reactos/base/applications/network/net/cmdLocalGroup.c @@ -41,7 +41,8 @@ EnumerateLocalGroups(VOID) PrintToConsole(L"\n"); PrintResourceString(IDS_LOCALGROUP_ALIASES, pServer->sv100_name); PrintToConsole(L"\n\n"); - PrintToConsole(L"------------------------------------------\n"); + PrintPadding(L'-', 79); + PrintToConsole(L"\n"); NetApiBufferFree(pServer); @@ -62,7 +63,7 @@ EnumerateLocalGroups(VOID) for (i = 0; i < dwRead; i++) { - if (pBuffer[i].lgrpi0_name) + if (pBuffer[i].lgrpi0_name) PrintToConsole(L"*%s\n", pBuffer[i].lgrpi0_name); } @@ -141,7 +142,8 @@ DisplayLocalGroup(LPWSTR lpGroupName) PrintResourceString(IDS_LOCALGROUP_MEMBERS); PrintToConsole(L"\n\n"); - PrintToConsole(L"------------------------------------------\n"); + PrintPadding(L'-', 79); + PrintToConsole(L"\n"); for (i = 0; i < dwRead; i++) { diff --git a/reactos/base/applications/network/net/cmdUser.c b/reactos/base/applications/network/net/cmdUser.c index f09e6603e28..bc735717380 100644 --- a/reactos/base/applications/network/net/cmdUser.c +++ b/reactos/base/applications/network/net/cmdUser.c @@ -40,7 +40,8 @@ EnumerateUsers(VOID) PrintToConsole(L"\n"); PrintResourceString(IDS_USER_ACCOUNTS, pServer->sv100_name); PrintToConsole(L"\n\n"); - PrintToConsole(L"------------------------------------------\n"); + PrintPadding(L'-', 79); + PrintToConsole(L"\n"); NetApiBufferFree(pServer); @@ -263,7 +264,7 @@ DisplayUser(LPWSTR lpUserName) for (i = 0; i < dwLocalGroupTotal; i++) { if (i != 0) - PrintToConsole(L" "); + PrintPadding(L' ', nPaddedLength); PrintToConsole(L"*%s\n", pLocalGroupInfo[i].lgrui0_name); } } @@ -278,7 +279,7 @@ DisplayUser(LPWSTR lpUserName) for (i = 0; i < dwGroupTotal; i++) { if (i != 0) - PrintToConsole(L" "); + PrintPadding(L' ', nPaddedLength); PrintToConsole(L"*%s\n", pGroupInfo[i].grui0_name); } } diff --git a/reactos/base/applications/network/net/main.c b/reactos/base/applications/network/net/main.c index 20614654972..b1293fa7327 100644 --- a/reactos/base/applications/network/net/main.c +++ b/reactos/base/applications/network/net/main.c @@ -84,6 +84,22 @@ PrintPaddedResourceString( } +VOID +PrintPadding( + WCHAR chr, + INT nPaddedLength) +{ + WCHAR szMsgBuffer[MAX_BUFFER_SIZE]; + INT i; + + for (i = 0; i < nPaddedLength; i++) + szMsgBuffer[i] = chr; + szMsgBuffer[nPaddedLength] = UNICODE_NULL; + + WriteToConsole(szMsgBuffer); +} + + VOID PrintToConsole( LPWSTR lpFormat, diff --git a/reactos/base/applications/network/net/net.h b/reactos/base/applications/network/net/net.h index 6e7993578a8..f117f31ca02 100644 --- a/reactos/base/applications/network/net/net.h +++ b/reactos/base/applications/network/net/net.h @@ -35,6 +35,11 @@ PrintPaddedResourceString( INT resID, INT nPaddedLength); +VOID +PrintPadding( + WCHAR chr, + INT nPaddedLength); + VOID PrintToConsole( LPWSTR lpFormat,