Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-19 19:28:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NETSTAT] Optimize a bit (#5405)

Browse source 
in netstat.c 100% of the calls to
    DisplayTableHeader();
have in the exact line beforehand a call to
    ConResPuts(StdOut, IDS_ACTIVE_CONNECT);

So let's fuse them.

Also fix a superfluous space in the *.rc files before it will get duplicated
a thousand times.
This commit is contained in:
Joachim Henze 2023-07-05 20:52:04 +02:00 committed by GitHub
parent 3e23cdf9ee
commit 8ef47d2e5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
base/applications/network/netstat/lang/en-US.rc
View file

@ -104,7 +104,7 @@ END
STRINGTABLE
BEGIN
IDS_ERROR_WSA_START "ERROR: WSAStartup() failed : %d\n"
IDS_ERROR_WSA_START "ERROR: WSAStartup() failed: %d\n"
IDS_ERROR_ROUTE "ERROR: Cannot find 'route.exe'\n"
IDS_ERROR_TCP_SNAPSHOT "ERROR: Failed to snapshot TCP endpoints.\n"
IDS_ERROR_UDP_ENDPOINT "ERROR: Failed to snapshot UDP endpoints.\n"

2
base/applications/network/netstat/lang/pl-PL.rc
View file

@ -106,7 +106,7 @@ END
STRINGTABLE
BEGIN
IDS_ERROR_WSA_START "BŁĄD: Procedura WSAStartup() nie powiodła się : %d\n"
IDS_ERROR_WSA_START "BŁĄD: Procedura WSAStartup() nie powiodła się: %d\n"
IDS_ERROR_ROUTE "BŁĄD: Nie można odnaleźć pliku 'route.exe'\n"
IDS_ERROR_TCP_SNAPSHOT "BŁĄD: Nie powiodło się utworzenie migawki dla punktów końcowych TCP.\n"
IDS_ERROR_UDP_ENDPOINT "BŁĄD: Nie powiodło się utworzenie migawki dla punktów końcowych UDP.\n"

2
base/applications/network/netstat/lang/zh-TW.rc
View file

@ -110,7 +110,7 @@ END
STRINGTABLE
BEGIN
IDS_ERROR_WSA_START "錯誤: WSAStartup() 失敗 : %d\n"
IDS_ERROR_WSA_START "錯誤: WSAStartup() 失敗: %d\n"
IDS_ERROR_ROUTE "錯誤: 找不到 'route.exe'\n"
IDS_ERROR_TCP_SNAPSHOT "錯誤: 無法取得 TCP 端點快照。\n"
IDS_ERROR_UDP_ENDPOINT "錯誤: 無法取得 UDP 端點快照。\n"

6
base/applications/network/netstat/netstat.c
View file

@ -63,6 +63,7 @@ VOID DoFormatMessage(DWORD ErrorCode)
*/
VOID DisplayTableHeader(VOID)
{
ConResPuts(StdOut, IDS_ACTIVE_CONNECT);
ConResPuts(StdOut, IDS_DISPLAY_THEADER);
if (bDoShowProcessId)
ConResPuts(StdOut, IDS_DISPLAY_PROCESS);
@ -115,7 +116,6 @@ BOOL ParseCmdline(int argc, wchar_t* argv[])
bDoShowProtoCons = TRUE;
if (i+1 >= argc)
{
ConResPuts(StdOut, IDS_ACTIVE_CONNECT);
DisplayTableHeader();
return TRUE;
}
@ -173,7 +173,6 @@ BOOL DisplayOutput(VOID)
{
if (bNoOptions)
{
ConResPuts(StdOut, IDS_ACTIVE_CONNECT);
DisplayTableHeader();
return ShowTcpTable();
}
@ -209,13 +208,11 @@ BOOL DisplayOutput(VOID)
case TCP:
if (bDoShowProtoStats)
ShowTcpStatistics();
ConResPuts(StdOut, IDS_ACTIVE_CONNECT);
DisplayTableHeader();
return ShowTcpTable();
case UDP:
if (bDoShowProtoStats)
ShowUdpStatistics();
ConResPuts(StdOut, IDS_ACTIVE_CONNECT);
DisplayTableHeader();
return (bDoShowAllCons ? ShowUdpTable() : TRUE);
default:
@ -232,7 +229,6 @@ BOOL DisplayOutput(VOID)
}
else
{
ConResPuts(StdOut, IDS_ACTIVE_CONNECT);
DisplayTableHeader();
if (ShowTcpTable() && bDoShowAllCons)
ShowUdpTable();