emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

top: some minor tweaks against a few of Craig's tweaks

Browse Source 
Rather than importing NORETURN & MALLOC, it feels more
natural to use the native gcc attribute for NORETURN &
eliminate the use of a questionable MALLOC altogether.

Reference(s):
commit ccb6ae8de1

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2016-04-16 00:00:00 -05:00 committed by Craig Small
parent 5d0431891a
commit 9fb09268bb
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
top/top.c
View File

@ -55,7 +55,6 @@
#include "top.h" #include "top.h"
#include "top_nls.h" #include "top_nls.h"
#define NORETURN __attribute__((__noreturn__))
/*###### Miscellaneous global stuff ####################################*/ /*###### Miscellaneous global stuff ####################################*/
@ -321,7 +320,7 @@ static void at_eoj (void) {
/* /*
* The real program end */ * The real program end */
static void bye_bye (const char *str) NORETURN; static void bye_bye (const char *str) __attribute__((__noreturn__));
static void bye_bye (const char *str) { static void bye_bye (const char *str) {
at_eoj(); // restore tty in preparation for exit at_eoj(); // restore tty in preparation for exit
#ifdef ATEOJ_RPTSTD #ifdef ATEOJ_RPTSTD
@ -406,7 +405,7 @@ static void bye_bye (const char *str) {
/* /*
* Standard error handler to normalize the look of all err output */ * Standard error handler to normalize the look of all err output */
static void error_exit (const char *str) NORETURN; static void error_exit (const char *str) __attribute__((__noreturn__));
static void error_exit (const char *str) { static void error_exit (const char *str) {
static char buf[MEDBUFSIZ]; static char buf[MEDBUFSIZ];
@ -438,7 +437,7 @@ static void sig_abexit (int sig) {
* Catches: * Catches:
* SIGALRM, SIGHUP, SIGINT, SIGPIPE, SIGQUIT, SIGTERM, * SIGALRM, SIGHUP, SIGINT, SIGPIPE, SIGQUIT, SIGTERM,
* SIGUSR1 and SIGUSR2 */ * SIGUSR1 and SIGUSR2 */
static void sig_endpgm (int dont_care_sig) NORETURN; static void sig_endpgm (int dont_care_sig) __attribute__((__noreturn__));
static void sig_endpgm (int dont_care_sig) { static void sig_endpgm (int dont_care_sig) {
sigset_t ss; sigset_t ss;
@ -740,9 +739,7 @@ static void updt_scroll_msg (void) {
/* /*
* Handle our own memory stuff without the risk of leaving the * Handle our own memory stuff without the risk of leaving the
* user's terminal in an ugly state should things go sour. */ * user's terminal in an ugly state should things go sour. */
#define MALLOC __attribute__ ((__malloc__))
static void *alloc_c (size_t num) MALLOC;
static void *alloc_c (size_t num) { static void *alloc_c (size_t num) {
void *pv; void *pv;
@ -753,7 +750,6 @@ static void *alloc_c (size_t num) {
} // end: alloc_c } // end: alloc_c
static void *alloc_r (void *ptr, size_t num) MALLOC;
static void *alloc_r (void *ptr, size_t num) { static void *alloc_r (void *ptr, size_t num) {
void *pv; void *pv;
@ -764,7 +760,6 @@ static void *alloc_r (void *ptr, size_t num) {
} // end: alloc_r } // end: alloc_r
static char *alloc_s (const char *str) MALLOC;
static char *alloc_s (const char *str) { static char *alloc_s (const char *str) {
return strcpy(alloc_c(strlen(str) +1), str); return strcpy(alloc_c(strlen(str) +1), str);
} // end: alloc_s } // end: alloc_s