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

vmstat: Null the diskstats pointer

Browse Source 
I'm not sure why, but the make check will now fail for vmstat

Running ./vmstat.test/vmstat.exp ...
FAIL: vmstat disk information (-d option)

With the _new function returning the error.
In vmstat all other structures are set to NULL before calling _new
except the diskstat ones. This has been corrected.
This commit is contained in:
Craig Small 2020-09-13 10:25:19 +10:00
parent d3203d99dd
commit b0e7a52f65
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vmstat.c
View File

@ -542,7 +542,7 @@ static void diskpartition_header(const char *partition_name)
static void diskpartition_format(const char *partition_name)
{
#define partVAL(x) DISKSTATS_VAL(x, ul_int, stack, disk_stat)
struct diskstats_info *disk_stat;
struct diskstats_info *disk_stat = NULL;
struct diskstats_stack *stack;
struct diskstats_result *got;
const char format[] = "%21lu %16lu %10lu %16lu\n";
@ -642,7 +642,7 @@ static void diskheader(void)
static void diskformat(void)
{
#define diskVAL(e,t) DISKSTATS_VAL(e, t, reap->stacks[j], disk_stat)
struct diskstats_info *disk_stat;
struct diskstats_info *disk_stat = NULL;
struct diskstats_reaped *reap;
int i, j;
time_t the_time;
@ -765,7 +765,7 @@ static void slabformat (void)
static void disksum_format(void)
{
#define diskVAL(e,t) DISKSTATS_VAL(e, t, reap->stacks[j], disk_stat)
struct diskstats_info *disk_stat;
struct diskstats_info *disk_stat = NULL;
struct diskstats_reaped *reap;
int j, disk_count, part_count;
unsigned long reads, merged_reads, read_sectors, milli_reading, writes,