[ros-diffs] [reactos] 01/01: [NETSTAT] pragma once, reorder, fix pl-PL.rc (#5407)

[Joachim Henze]

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

commit c1245a897fefa0379421ae0f4c01d4ffec041bf6
Author:     Joachim Henze <joachim.henze(a)reactos.org>
AuthorDate: Thu Jul 6 18:19:30 2023 +0200
Commit:     GitHub <noreply(a)github.com>
CommitDate: Thu Jul 6 18:19:30 2023 +0200

    [NETSTAT] pragma once, reorder, fix pl-PL.rc (#5407)
    
    
    - add a pragma once into the header
    - order -o options alphabetically also for the global variables, not only in
usage-help
    - pl-PL.rc: fix wrong alignment of IDS_ETHERNET_THEADER and its data
    - pl-PL.rc: also don't pad the data with 2 spaces here in the beginning, which
                we don't do in any other locale, and MS netstat also doesn't do
that here.
                pl-PL.rc most likely got this wrong because it was created while en-US
wasn't finished yet.
---
 base/applications/network/netstat/lang/pl-PL.rc | 14 +++++++-------
 base/applications/network/netstat/netstat.h     |  3 ++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/base/applications/network/netstat/lang/pl-PL.rc
b/base/applications/network/netstat/lang/pl-PL.rc
index caa9cfe93ff..d418edd8a95 100644
--- a/base/applications/network/netstat/lang/pl-PL.rc
+++ b/base/applications/network/netstat/lang/pl-PL.rc
@@ -95,13 +95,13 @@ END
 STRINGTABLE
 BEGIN
     IDS_ETHERNET_INTERFACE_STAT     "Statystyki interfejsu\n\n"
-    IDS_ETHERNET_THEADER            "                           Odebrano         
Wysłano\n\n"
-    IDS_ETHERNET_BYTES              "  Bajty                               %14lu
%15lu\n"
-    IDS_ETHERNET_UNICAST_PACKET     "  Pakiety emisji pojedynczej          %14lu
%15lu\n"
-    IDS_ETHERNET_NON_UNICAST_PACKET "  Pakiety inne niż emisji pojedynczej %14lu
%15lu\n"
-    IDS_ETHERNET_DISCARD            "  Odrzucone                           %14lu
%15lu\n"
-    IDS_ETHERNET_ERROR              "  Błędy                               %14lu
%15lu\n"
-    IDS_ETHERNET_UNKNOWN            "  Nieznane protokoły                 
%14lu\n"
+    IDS_ETHERNET_THEADER            "                                         
Odebrano         Wysłano\n\n"
+    IDS_ETHERNET_BYTES              "Bajty                               %14lu
%15lu\n"
+    IDS_ETHERNET_UNICAST_PACKET     "Pakiety emisji pojedynczej          %14lu
%15lu\n"
+    IDS_ETHERNET_NON_UNICAST_PACKET "Pakiety inne niż emisji pojedynczej %14lu
%15lu\n"
+    IDS_ETHERNET_DISCARD            "Odrzucone                           %14lu
%15lu\n"
+    IDS_ETHERNET_ERROR              "Błędy                               %14lu
%15lu\n"
+    IDS_ETHERNET_UNKNOWN            "Nieznane protokoły                 
%14lu\n"
 END
 
 STRINGTABLE
diff --git a/base/applications/network/netstat/netstat.h
b/base/applications/network/netstat/netstat.h
index aebd80c4f2d..2b9458cd36f 100644
--- a/base/applications/network/netstat/netstat.h
+++ b/base/applications/network/netstat/netstat.h
@@ -1,3 +1,4 @@
+#pragma once
 
 /* Maximum string lengths for ASCII ip address and port names */
 #define HOSTNAMELEN     256
@@ -10,10 +11,10 @@ BOOL bDoShowAllCons    = FALSE; // -a
 BOOL bDoShowProcName   = FALSE; // -b
 BOOL bDoShowEthStats   = FALSE; // -e
 BOOL bDoShowNumbers    = FALSE; // -n
+BOOL bDoShowProcessId  = FALSE; // -o
 BOOL bDoShowProtoCons  = FALSE; // -p
 BOOL bDoShowRouteTable = FALSE; // -r
 BOOL bDoShowProtoStats = FALSE; // -s
-BOOL bDoShowProcessId  = FALSE; // -o
 BOOL bDoDispSeqComp    = FALSE; // -v
 BOOL bLoopOutput       = FALSE; // interval