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

library: procps_uptime() return value is a status

Browse Source 
procps_uptime, previously just plain uptime() used to put the
uptime (as a double) in the first argument and return uptime
(as an int).

It meant if you ran
 myuptime2 = procps_uptime(&myuptime1, NULL);
You might get different results for myuptime1 and myuptime2 because
they are different types.

Most library calls use the return value to return the status,
procps_uptime was in the middle.

Until now.

This function will return 0 on success. If you want (for whatever
reason) uptime as an int then cast it.

All of the procps binaries didn't use the return value for uptime
except ps which set a variable to it but never used it anywhere.
This commit is contained in:
Craig Small
2016-05-01 16:50:25 +10:00
parent 6151b794c6
commit 6b5cb345c5
5 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ps/global.c
View File

@ -172,7 +172,6 @@ unsigned personality = 0xffffffff;
int prefer_bsd_defaults = -1;
int screen_cols = -1;
int screen_rows = -1;
time_t seconds_since_boot = -1;
selection_node *selection_list = (selection_node *)0xdeadbeef;
unsigned simple_select = 0xffffffff;
sort_node *sort_list = (sort_node *)0xdeadbeef; /* ready-to-use sort list */
@ -502,7 +501,6 @@ void reset_global(void){
negate_selection = 0;
page_size = getpagesize();
running_only = 0;
seconds_since_boot = procps_uptime(0,0);
selection_list = NULL;
simple_select = 0;
sort_list = NULL;