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

top: relocate a prototype to prevent compiler warning

Browse Source 
Until the 'locate/search' provisions were added,
top avoided the need for any function prototypes
through careful source file organization.  But
the addition of the find_string function required
a prototpe for task_show, lest a massive file
reorganization be undertaken.

This commit moves the actual protype out of top.h
and places it adjacent to the caller in order to
avoid a warning when top_nls.c is compiled.

References:
commit 270e8e7eeb
commit d6e6a9aa38

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2012-02-11 02:02:02 -06:00 committed by Craig Small
parent 4dac0dfeb1
commit efb9fcb816
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
top/top.c
View File

@ -2723,6 +2723,12 @@ static void file_writerc (void) {
} // end: file_writerc } // end: file_writerc
/* This is currently the one true prototype require by top.
It is placed here, instead of top.h, so as to avoid a compiler
warning when top_nls.c is compiled. */
static void task_show (const WIN_t *q, const proc_t *p, char *ptr);
static void find_string (int ch) { static void find_string (int ch) {
#define reDUX (found) ? N_txt(WORD_another_txt) : "" #define reDUX (found) ? N_txt(WORD_another_txt) : ""
static char str[SCREENMAX]; static char str[SCREENMAX];

6
top/top.h
View File

@ -531,8 +531,8 @@ typedef struct WIN_t {
/*###### Some Prototypes (ha!) #########################################*/ /*###### Some Prototypes (ha!) #########################################*/
/* These 'prototypes' are here mostly for documentation purposes -- */ /* These 'prototypes' are here exclusively for documentation purposes. */
/* for now, the only essential one is task_show needed by find_string */ /* ( see the find_string function for the one true required protoype ) */
/*------ Sort callbacks ------------------------------------------------*/ /*------ Sort callbacks ------------------------------------------------*/
/* for each possible field, in the form of: */ /* for each possible field, in the form of: */
/*atic int sort_P_XXX (const proc_t **P, const proc_t **Q); */ /*atic int sort_P_XXX (const proc_t **P, const proc_t **Q); */
@ -618,7 +618,7 @@ typedef struct WIN_t {
//atic void do_key (int ch); //atic void do_key (int ch);
//atic void summary_hlp (CPU_t *cpu, const char *pfx); //atic void summary_hlp (CPU_t *cpu, const char *pfx);
//atic void summary_show (void); //atic void summary_show (void);
static void task_show (const WIN_t *q, const proc_t *p, char *ptr); //atic void task_show (const WIN_t *q, const proc_t *p, char *ptr);
//atic int window_show (WIN_t *q, int wmax); //atic int window_show (WIN_t *q, int wmax);
/*------ Entry point plus two ------------------------------------------*/ /*------ Entry point plus two ------------------------------------------*/
//atic void frame_hlp (int wix, int max); //atic void frame_hlp (int wix, int max);