diff options
| author | Eugene V. Lyubimkin <jackyf@debian.org> | 2011-11-26 15:58:33 +0200 |
|---|---|---|
| committer | Daniel Lange <DLange@git.local> | 2016-04-11 13:00:30 +0200 |
| commit | c65eb8be811f59b55d64d9e7654c33708de79ad9 (patch) | |
| tree | ee6e542b988263c49f0e1200d6aa5aa635667fe8 /LoadAverageMeter.c | |
| parent | 38174fffd79f54a8be7642bf170a2320b29e8063 (diff) | |
| parent | eaf11cc12a1aa4b050a8a1e7ea3770d3d9c81e95 (diff) | |
| download | debian_htop-c65eb8be811f59b55d64d9e7654c33708de79ad9.tar.gz debian_htop-c65eb8be811f59b55d64d9e7654c33708de79ad9.tar.bz2 debian_htop-c65eb8be811f59b55d64d9e7654c33708de79ad9.zip | |
Imported Debian patch 1.0-1debian/1.0-1
Diffstat (limited to 'LoadAverageMeter.c')
| -rw-r--r-- | LoadAverageMeter.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/LoadAverageMeter.c b/LoadAverageMeter.c index 1109dab..02c8ad5 100644 --- a/LoadAverageMeter.c +++ b/LoadAverageMeter.c @@ -1,6 +1,6 @@ /* htop -(C) 2004-2010 Hisham H. Muhammad +(C) 2004-2011 Hisham H. Muhammad Released under the GNU GPL, see the COPYING file in the source distribution for its full text. */ @@ -20,12 +20,15 @@ int LoadMeter_attributes[] = { LOAD }; static inline void LoadAverageMeter_scan(double* one, double* five, double* fifteen) { int activeProcs, totalProcs, lastProc; + *one = 0; *five = 0; *fifteen = 0; FILE *fd = fopen(PROCDIR "/loadavg", "r"); - int total = fscanf(fd, "%lf %lf %lf %d/%d %d", one, five, fifteen, - &activeProcs, &totalProcs, &lastProc); - (void) total; - assert(total == 6); - fclose(fd); + if (fd) { + int total = fscanf(fd, "%32lf %32lf %32lf %32d/%32d %32d", one, five, fifteen, + &activeProcs, &totalProcs, &lastProc); + (void) total; + assert(total == 6); + fclose(fd); + } } static void LoadAverageMeter_setValues(Meter* this, char* buffer, int size) { |