Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-15 03:43:50 +00:00
Code Issues Releases Activity

Modify last commit to keep compiler happy since it claims devbuf can never be null (should we really trust gcc that much?)

Browse Source
This commit is contained in:
Cesare Tirabassi 2010-01-30 19:23:31 +01:00
parent 44e3708cdb
commit d620ac6f0f
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/linux.c
View File

@ -2279,13 +2279,11 @@ void update_diskio(void)
&& major != RAMDISK_MAJOR && major != LOOP_MAJOR) { && major != RAMDISK_MAJOR && major != LOOP_MAJOR) {
/* If the last character of the device is a digit we assume /* If the last character of the device is a digit we assume
* it is a subdevice (needed for kernel > 2.6.31) */ * it is a subdevice (needed for kernel > 2.6.31) */
if (devbuf) {
len_devbuf = strlen(devbuf); len_devbuf = strlen(devbuf);
if ((len_devbuf > 0) && !isdigit(devbuf[len_devbuf-1])) { if ((len_devbuf > 0) && !isdigit(devbuf[len_devbuf-1])) {
total_reads += reads; total_reads += reads;
total_writes += writes; total_writes += writes;
} }
}
} else { } else {
col_count = sscanf(buf, "%u %u %s %*u %u %*u %u", col_count = sscanf(buf, "%u %u %s %*u %u %*u %u",
&major, &minor, devbuf, &reads, &writes); &major, &minor, devbuf, &reads, &writes);