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

top: correct, improve and otherwise tweak configs_read

Browse Source 
This patch addresses the four '-Wunused-result' errors
generated whenever an optimized compile is invoked. It
also made the configs_read() guy a little more robust.

In the process, some logic was rearranged slightly and
some comments were re-indented simply for consistency.

Reference(s):
warning: ignoring return value of 'fgets', declared with attribute warn_unused_result [-Wunused-result]
warning: ignoring return value of 'fscanf', declared with attribute warn_unused_result [-Wunused-result]

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2013-08-20 00:00:00 -05:00 committed by Craig Small
parent 80e6783436
commit 819ede1a6b
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
top/top.c
View File

@ -3394,26 +3394,25 @@ static void configs_read (void) {
fp = fopen(SYS_RCFILESPEC, "r"); fp = fopen(SYS_RCFILESPEC, "r");
if (fp) { if (fp) {
fbuf[0] = '\0'; if (fgets(fbuf, sizeof(fbuf), fp)) { // sys rc file, line 1
fgets(fbuf, sizeof(fbuf), fp); // sys rc file, line 1 Secure_mode = 1;
if (strchr(fbuf, 's')) Secure_mode = 1; if (fgets(fbuf, sizeof(fbuf), fp)) // sys rc file, line 2
fbuf[0] = '\0'; sscanf(fbuf, "%f", &Rc.delay_time);
fgets(fbuf, sizeof(fbuf), fp); // sys rc file, line 2 }
sscanf(fbuf, "%f", &Rc.delay_time);
fclose(fp); fclose(fp);
} }
fp = fopen(Rc_name, "r"); fp = fopen(Rc_name, "r");
if (fp) { if (fp) {
int tmp_whole, tmp_fract; int tmp_whole, tmp_fract;
fbuf[0] = '\0'; if (fgets(fbuf, sizeof(fbuf), fp)) // ignore eyecatcher
fgets(fbuf, sizeof(fbuf), fp); // ignore eyecatcher ; // avoid -Wunused-result
if (6 != fscanf(fp if (6 != fscanf(fp
, "Id:%c, Mode_altscr=%d, Mode_irixps=%d, Delay_time=%d.%d, Curwin=%d\n" , "Id:%c, Mode_altscr=%d, Mode_irixps=%d, Delay_time=%d.%d, Curwin=%d\n"
, &Rc.id, &Rc.mode_altscr, &Rc.mode_irixps, &tmp_whole, &tmp_fract, &i)) { , &Rc.id, &Rc.mode_altscr, &Rc.mode_irixps, &tmp_whole, &tmp_fract, &i)) {
p = fmtmk(N_fmt(RC_bad_files_fmt), Rc_name); p = fmtmk(N_fmt(RC_bad_files_fmt), Rc_name);
Rc_questions = -1; Rc_questions = -1;
goto try_inspect_entries; // maybe a faulty 'inspect' echo goto try_inspect_entries; // maybe a faulty 'inspect' echo
} }
// you saw that, right? (fscanf stickin' it to 'i') // you saw that, right? (fscanf stickin' it to 'i')
Curwin = &Winstk[i]; Curwin = &Winstk[i];
@ -3442,20 +3441,20 @@ static void configs_read (void) {
goto default_or_error; goto default_or_error;
switch (Rc.id) { switch (Rc.id) {
case 'f': // 3.3.0 thru 3.3.3 (procps-ng) case 'a': // 3.2.8 (former procps)
SETw(w, Show_JRNUMS); // fall through ! if (config_cvt(w))
case 'g': // current RCF_VERSION_ID goto default_or_error;
default: // and future versions? break;
case 'f': // 3.3.0 thru 3.3.3 (procps-ng)
SETw(w, Show_JRNUMS); // fall through !
case 'g': // current RCF_VERSION_ID
default: // and future versions?
if (strlen(w->rc.fieldscur) != sizeof(DEF_FIELDS) - 1) if (strlen(w->rc.fieldscur) != sizeof(DEF_FIELDS) - 1)
goto default_or_error; goto default_or_error;
for (x = 0; x < P_MAXPFLGS; ++x) for (x = 0; x < P_MAXPFLGS; ++x)
if (P_MAXPFLGS <= FLDget(w, x)) if (P_MAXPFLGS <= FLDget(w, x))
goto default_or_error; goto default_or_error;
break; break;
case 'a': // 3.2.8 (former procps)
if (config_cvt(w))
goto default_or_error;
break;
} }
#ifndef USE_X_COLHDR #ifndef USE_X_COLHDR
OFFw(w, NOHIFND_xxx | NOHISEL_xxx); OFFw(w, NOHIFND_xxx | NOHISEL_xxx);
@ -3463,8 +3462,9 @@ static void configs_read (void) {
} // end: for (GROUPSMAX) } // end: for (GROUPSMAX)
// any new addition(s) last, for older rcfiles compatibility... // any new addition(s) last, for older rcfiles compatibility...
fscanf(fp, "Fixed_widest=%d, Summ_mscale=%d, Task_mscale=%d, Zero_suppress=%d\n" if (fscanf(fp, "Fixed_widest=%d, Summ_mscale=%d, Task_mscale=%d, Zero_suppress=%d\n"
, &Rc.fixed_widest, &Rc.summ_mscale, &Rc.task_mscale, &Rc.zero_suppress); , &Rc.fixed_widest, &Rc.summ_mscale, &Rc.task_mscale, &Rc.zero_suppress))
; // avoid -Wunused-result
try_inspect_entries: try_inspect_entries:
// we'll start off Inspect stuff with 1 'potential' blank line // we'll start off Inspect stuff with 1 'potential' blank line