From d56d23d91adf3fad512e5311fcdd0ca129e820c7 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Thu, 18 Mar 2021 08:23:07 +1100 Subject: [PATCH] Each platform defines its own long opt macro, prefer printf Follow up on the two items of feedback from cgzones review, and resolve a build failure picked up by CI on Mac OS X. Related to https://github.com/htop-dev/htop/pull/564 --- darwin/Platform.h | 5 ++++- dragonflybsd/Platform.h | 5 ++++- freebsd/Platform.h | 5 ++++- htop.c | 12 ++---------- openbsd/Platform.h | 5 ++++- solaris/Platform.h | 5 ++++- unsupported/Platform.h | 5 ++++- 7 files changed, 26 insertions(+), 16 deletions(-) diff --git a/darwin/Platform.h b/darwin/Platform.h index ea0c8197..af95db9c 100644 --- a/darwin/Platform.h +++ b/darwin/Platform.h @@ -23,6 +23,9 @@ in the source distribution for its full text. #include "generic/uname.h" +#define PLATFORM_LONG_OPTIONS +#define PLATFORM_LONG_OPTIONS_USAGE + extern const ProcessField Platform_defaultFields[]; extern double Platform_timebaseToNS; @@ -77,7 +80,7 @@ static inline void Platform_getRelease(char** string) { *string = Generic_uname(); } -static bool Platform_getLongOption(ATTR_UNUSED int opt, ATTR_UNUSED int argc, ATTR_UNUSED char** argv) { +static inline bool Platform_getLongOption(ATTR_UNUSED int opt, ATTR_UNUSED int argc, ATTR_UNUSED char** argv) { return false; } diff --git a/dragonflybsd/Platform.h b/dragonflybsd/Platform.h index 213936cc..9ddcbc70 100644 --- a/dragonflybsd/Platform.h +++ b/dragonflybsd/Platform.h @@ -21,6 +21,9 @@ in the source distribution for its full text. #include "generic/uname.h" +#define PLATFORM_LONG_OPTIONS +#define PLATFORM_LONG_OPTIONS_USAGE + extern const ProcessField Platform_defaultFields[]; extern const SignalItem Platform_signals[]; @@ -67,7 +70,7 @@ static inline void Platform_getRelease(char** string) { *string = Generic_uname(); } -static bool Platform_getLongOption(ATTR_UNUSED int opt, ATTR_UNUSED int argc, ATTR_UNUSED char** argv) { +static inline bool Platform_getLongOption(ATTR_UNUSED int opt, ATTR_UNUSED int argc, ATTR_UNUSED char** argv) { return false; } diff --git a/freebsd/Platform.h b/freebsd/Platform.h index 93fd33e0..678579e3 100644 --- a/freebsd/Platform.h +++ b/freebsd/Platform.h @@ -22,6 +22,9 @@ in the source distribution for its full text. #include "generic/uname.h" +#define PLATFORM_LONG_OPTIONS +#define PLATFORM_LONG_OPTIONS_USAGE + extern const ProcessField Platform_defaultFields[]; extern const SignalItem Platform_signals[]; @@ -72,7 +75,7 @@ static inline void Platform_getRelease(char** string) { *string = Generic_uname(); } -static bool Platform_getLongOption(ATTR_UNUSED int opt, ATTR_UNUSED int argc, ATTR_UNUSED char** argv) { +static inline bool Platform_getLongOption(ATTR_UNUSED int opt, ATTR_UNUSED int argc, ATTR_UNUSED char** argv) { return false; } diff --git a/htop.c b/htop.c index 892057ea..15eb2a4b 100644 --- a/htop.c +++ b/htop.c @@ -36,20 +36,12 @@ in the source distribution for its full text. #include "XUtils.h" -#ifndef PLATFORM_LONG_OPTIONS -#define PLATFORM_LONG_OPTIONS -#endif - -#ifndef PLATFORM_LONG_OPTIONS_USAGE -#define PLATFORM_LONG_OPTIONS_USAGE -#endif - static void printVersionFlag(const char* name) { - fprintf(stdout, "%s " VERSION "\n", name); + printf("%s " VERSION "\n", name); } static void printHelpFlag(const char* name) { - fprintf(stdout, "%s " VERSION "\n" + printf("%s " VERSION "\n" COPYRIGHT "\n" "Released under the GNU GPLv2.\n\n" "-C --no-color Use a monochrome color scheme\n" diff --git a/openbsd/Platform.h b/openbsd/Platform.h index ba7348ce..c4add09f 100644 --- a/openbsd/Platform.h +++ b/openbsd/Platform.h @@ -23,6 +23,9 @@ in the source distribution for its full text. #include "generic/uname.h" +#define PLATFORM_LONG_OPTIONS +#define PLATFORM_LONG_OPTIONS_USAGE + extern const ProcessField Platform_defaultFields[]; /* see /usr/include/sys/signal.h */ @@ -70,7 +73,7 @@ static inline void Platform_getRelease(char** string) { *string = Generic_uname(); } -static bool Platform_getLongOption(ATTR_UNUSED int opt, ATTR_UNUSED int argc, ATTR_UNUSED char** argv) { +static inline bool Platform_getLongOption(ATTR_UNUSED int opt, ATTR_UNUSED int argc, ATTR_UNUSED char** argv) { return false; } diff --git a/solaris/Platform.h b/solaris/Platform.h index cabfd5c9..4485cbbf 100644 --- a/solaris/Platform.h +++ b/solaris/Platform.h @@ -26,6 +26,9 @@ in the source distribution for its full text. #include "generic/uname.h" +#define PLATFORM_LONG_OPTIONS +#define PLATFORM_LONG_OPTIONS_USAGE + #define kill(pid, signal) kill(pid / 1024, signal) typedef struct var kvar_t; @@ -89,7 +92,7 @@ static inline void Platform_getRelease(char** string) { *string = Generic_uname(); } -static bool Platform_getLongOption(ATTR_UNUSED int opt, ATTR_UNUSED int argc, ATTR_UNUSED char** argv) { +static inline bool Platform_getLongOption(ATTR_UNUSED int opt, ATTR_UNUSED int argc, ATTR_UNUSED char** argv) { return false; } diff --git a/unsupported/Platform.h b/unsupported/Platform.h index d95feee5..8df948ef 100644 --- a/unsupported/Platform.h +++ b/unsupported/Platform.h @@ -17,6 +17,9 @@ in the source distribution for its full text. #include "UnsupportedProcess.h" +#define PLATFORM_LONG_OPTIONS +#define PLATFORM_LONG_OPTIONS_USAGE + extern const SignalItem Platform_signals[]; extern const unsigned int Platform_numberOfSignals; @@ -61,7 +64,7 @@ void Platform_getHostname(char* buffer, size_t size); void Platform_getRelease(char** string); -static bool Platform_getLongOption(ATTR_UNUSED int opt, ATTR_UNUSED int argc, ATTR_UNUSED char** argv) { +static inline bool Platform_getLongOption(ATTR_UNUSED int opt, ATTR_UNUSED int argc, ATTR_UNUSED char** argv) { return false; }