Merge branch 'style-header-consistency' of https://github.com/BenBE/htop

into BenBE-style-header-consistency
htop-dev · Oct 10, 2023 · 43cb4a5 · 43cb4a5
2 parents 4103c23 + 8e4ce18
commit 43cb4a5
Show file tree

Hide file tree

Showing 32 changed files with 126 additions and 21 deletions.
diff --git a/CRT.h b/CRT.h
@@ -7,7 +7,7 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "config.h"
+#include "config.h" // IWYU pragma: keep
 
 #include <stdbool.h>
 

diff --git a/CommandScreen.c b/CommandScreen.c
@@ -1,3 +1,11 @@
+/*
+htop - CommandScreen.c
+(C) 2017,2020 ryenus
+(C) 2020,2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
 #include "config.h" // IWYU pragma: keep
 
 #include "CommandScreen.h"

diff --git a/CommandScreen.h b/CommandScreen.h
@@ -1,5 +1,12 @@
 #ifndef HEADER_CommandScreen
 #define HEADER_CommandScreen
+/*
+htop - CommandScreen.h
+(C) 2017,2020 ryenus
+(C) 2020,2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
 
 #include "InfoScreen.h"
 #include "Object.h"

diff --git a/DynamicMeter.h b/DynamicMeter.h
@@ -1,5 +1,12 @@
 #ifndef HEADER_DynamicMeter
 #define HEADER_DynamicMeter
+/*
+htop - DynamicMeter.h
+(C) 2021 htop dev team
+(C) 2021 Red Hat, Inc.  All Rights Reserved.
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
 
 #include <stdbool.h>
 

diff --git a/EnvScreen.c b/EnvScreen.c
@@ -1,3 +1,12 @@
+/*
+htop - EnvScreen.c
+(C) 2015,2016 Michael Klein
+(C) 2016,2017 Hisham H. Muhammad
+(C) 2020,2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
 #include "config.h" // IWYU pragma: keep
 
 #include "EnvScreen.h"

diff --git a/EnvScreen.h b/EnvScreen.h
@@ -1,5 +1,13 @@
 #ifndef HEADER_EnvScreen
 #define HEADER_EnvScreen
+/*
+htop - EnvScreen.h
+(C) 2015,2016 Michael Klein
+(C) 2016,2017 Hisham H. Muhammad
+(C) 2020,2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
 
 #include "InfoScreen.h"
 #include "Object.h"

diff --git a/InfoScreen.c b/InfoScreen.c
@@ -1,3 +1,11 @@
+/*
+htop - InfoScreen.c
+(C) 2016 Hisham H. Muhammad
+(C) 2020,2022 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
 #include "config.h" // IWYU pragma: keep
 
 #include "InfoScreen.h"

diff --git a/InfoScreen.h b/InfoScreen.h
@@ -1,5 +1,12 @@
 #ifndef HEADER_InfoScreen
 #define HEADER_InfoScreen
+/*
+htop - InfoScreen.h
+(C) 2016 Hisham H. Muhammad
+(C) 2020,2022 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
 
 #include <stdbool.h>
 

diff --git a/Macros.h b/Macros.h
@@ -1,5 +1,11 @@
 #ifndef HEADER_Macros
 #define HEADER_Macros
+/*
+htop - Macros.h
+(C) 2020-2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
 
 #include <assert.h> // IWYU pragma: keep
 #include <math.h>

diff --git a/NetworkIOMeter.c b/NetworkIOMeter.c
@@ -1,3 +1,10 @@
+/*
+htop - NetworkIOMeter.c
+(C) 2020-2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
 #include "NetworkIOMeter.h"
 
 #include <stdbool.h>

diff --git a/NetworkIOMeter.h b/NetworkIOMeter.h
@@ -1,5 +1,11 @@
 #ifndef HEADER_NetworkIOMeter
 #define HEADER_NetworkIOMeter
+/*
+htop - NetworkIOMeter.h
+(C) 2020-2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
 
 #include "Meter.h"
 

diff --git a/ProvideCurses.h b/ProvideCurses.h
@@ -8,7 +8,7 @@ in the source distribution for its full text.
 */
 
 
-#include "config.h"
+#include "config.h" // IWYU pragma: keep
 
 // IWYU pragma: begin_exports
 

diff --git a/RichString.h b/RichString.h
@@ -7,7 +7,7 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "config.h"
+#include "config.h" // IWYU pragma: keep
 
 #include "ProvideCurses.h"
 

diff --git a/SignalsPanel.h b/SignalsPanel.h
@@ -9,12 +9,12 @@ in the source distribution for its full text.
 
 #include "config.h" // IWYU pragma: keep
 
+#include "Panel.h"
+
 #ifndef HTOP_SOLARIS
 #include <signal.h>
 #endif
 
-#include "Panel.h"
-
 
 typedef struct SignalItem_ {
    const char* name;

diff --git a/generic/fdstat_sysctl.c b/generic/fdstat_sysctl.c
@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "generic/fdstat_sysctl.h"
 
 #include <math.h>
@@ -14,8 +16,6 @@ in the source distribution for its full text.
 #include <sys/types.h> // Shitty FreeBSD upstream headers
 #include <sys/sysctl.h>
 
-#include "config.h"
-
 
 static void Generic_getFileDescriptors_sysctl_internal(
    const char* sysctlname_maxfiles,

diff --git a/generic/gettime.c b/generic/gettime.c
@@ -4,6 +4,7 @@ htop - generic/gettime.c
 Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
+
 #include "config.h"  // IWYU pragma: keep
 
 #include "generic/gettime.h"

diff --git a/generic/hostname.c b/generic/hostname.c
@@ -4,6 +4,7 @@ htop - generic/hostname.c
 Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
+
 #include "config.h"  // IWYU pragma: keep
 
 #include "generic/hostname.h"

diff --git a/generic/uname.c b/generic/uname.c
@@ -4,6 +4,7 @@ htop - generic/uname.c
 Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
+
 #include "config.h"  // IWYU pragma: keep
 
 #include "generic/uname.h"

diff --git a/linux/LibSensors.c b/linux/LibSensors.c
@@ -1,6 +1,13 @@
-#include "linux/LibSensors.h"
+/*
+htop - linux/LibSensors.c
+(C) 2020-2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
 
-#include "config.h"
+#include "linux/LibSensors.h"
 
 #ifdef HAVE_SENSORS_SENSORS_H
 

diff --git a/linux/LibSensors.h b/linux/LibSensors.h
@@ -1,5 +1,11 @@
 #ifndef HEADER_LibSensors
 #define HEADER_LibSensors
+/*
+htop - linux/LibSensors.h
+(C) 2020-2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
 
 #include "linux/LinuxMachine.h"
 

diff --git a/linux/LinuxMachine.h b/linux/LinuxMachine.h
@@ -7,7 +7,7 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "config.h"
+#include "config.h" // IWYU pragma: keep
 
 #include <stdbool.h>
 #include <sys/types.h>

diff --git a/linux/LinuxProcess.h b/linux/LinuxProcess.h
@@ -13,10 +13,10 @@ in the source distribution for its full text.
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include "linux/IOPriority.h"
 #include "Machine.h"
 #include "Object.h"
 #include "Process.h"
+#include "linux/IOPriority.h"
 
 
 #define PROCESS_FLAG_LINUX_IOPRIO    0x00000100

diff --git a/linux/LinuxProcessTable.h b/linux/LinuxProcessTable.h
@@ -7,7 +7,7 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "config.h"
+#include "config.h" // IWYU pragma: keep
 
 #include <stdbool.h>
 #include <sys/types.h>

diff --git a/linux/Platform.c b/linux/Platform.c
@@ -5,8 +5,7 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "ZramMeter.h"
-#include "config.h"
+#include "config.h" // IWYU pragma: keep
 
 #include "linux/Platform.h"
 
@@ -47,7 +46,6 @@ in the source distribution for its full text.
 #include "Panel.h"
 #include "PressureStallMeter.h"
 #include "ProvideCurses.h"
-#include "linux/SELinuxMeter.h"
 #include "Settings.h"
 #include "SwapMeter.h"
 #include "SysArchMeter.h"
@@ -58,6 +56,7 @@ in the source distribution for its full text.
 #include "linux/IOPriorityPanel.h"
 #include "linux/LinuxMachine.h"
 #include "linux/LinuxProcess.h"
+#include "linux/SELinuxMeter.h"
 #include "linux/SystemdMeter.h"
 #include "linux/ZramMeter.h"
 #include "linux/ZramStats.h"

diff --git a/linux/Platform.h b/linux/Platform.h
@@ -7,7 +7,7 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "config.h"
+#include "config.h" // IWYU pragma: keep
 
 #include <limits.h>
 #include <stdbool.h>
@@ -32,6 +32,7 @@ in the source distribution for its full text.
 #include "generic/hostname.h"
 #include "generic/uname.h"
 
+
 /* GNU/Hurd does not have PATH_MAX in limits.h */
 #ifndef PATH_MAX
    #define PATH_MAX 4096

diff --git a/linux/ZramMeter.c b/linux/ZramMeter.c
@@ -1,3 +1,11 @@
+/*
+htop - linux/ZramMeter.c
+(C) 2020 Murloc Knight
+(C) 2020-2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
 #include "linux/ZramMeter.h"
 
 #include <stddef.h>

diff --git a/linux/ZramMeter.h b/linux/ZramMeter.h
@@ -1,5 +1,12 @@
 #ifndef HEADER_ZramMeter
 #define HEADER_ZramMeter
+/*
+htop - linux/ZramMeter.h
+(C) 2020 Murloc Knight
+(C) 2020-2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
 
 #include "Meter.h"
 

diff --git a/pcp/PCPDynamicMeter.c b/pcp/PCPDynamicMeter.c
@@ -5,6 +5,7 @@ htop - PCPDynamicMeter.c
 Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
+
 #include "config.h" // IWYU pragma: keep
 
 #include "pcp/PCPDynamicMeter.h"

diff --git a/pcp/PCPMachine.c b/pcp/PCPMachine.c
@@ -18,8 +18,8 @@ in the source distribution for its full text.
 #include <string.h>
 #include <sys/time.h>
 
-#include "Macros.h"
 #include "Machine.h"
+#include "Macros.h"
 #include "Object.h"
 #include "Platform.h"
 #include "Settings.h"

diff --git a/pcp/PCPProcessTable.c b/pcp/PCPProcessTable.c
@@ -18,8 +18,8 @@ in the source distribution for its full text.
 #include <string.h>
 #include <sys/time.h>
 
-#include "Macros.h"
 #include "Machine.h"
+#include "Macros.h"
 #include "Object.h"
 #include "Platform.h"
 #include "Process.h"

diff --git a/solaris/Platform.h b/solaris/Platform.h
@@ -30,12 +30,12 @@ in the source distribution for its full text.
 
 #include "Action.h"
 #include "BatteryMeter.h"
+#include "CommandLine.h"
 #include "DiskIOMeter.h"
 #include "Hashtable.h"
 #include "NetworkIOMeter.h"
 #include "ProcessLocksScreen.h"
 #include "SignalsPanel.h"
-#include "CommandLine.h"
 #include "generic/gettime.h"
 #include "generic/hostname.h"
 #include "generic/uname.h"

diff --git a/solaris/SolarisMachine.h b/solaris/SolarisMachine.h
@@ -14,11 +14,11 @@ in the source distribution for its full text.
 #include <stdbool.h>
 #include <stdint.h>
 #include <sys/param.h>
-#include <sys/uio.h>
 #include <sys/resource.h>
+#include <sys/swap.h>
 #include <sys/sysconf.h>
 #include <sys/sysinfo.h>
-#include <sys/swap.h>
+#include <sys/uio.h>
 
 #include "Hashtable.h"
 #include "UsersTable.h"
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ in the source distribution for its full text. @@
     */
-    #include "config.h"
+    #include "config.h" // IWYU pragma: keep
     // IWYU pragma: begin_exports
@@ Expand Down @@