]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
hwclock: fix fgets unchecked return value warning on alpha
authorAndreas Henriksson <andreas@fatal.se>
Fri, 21 Aug 2015 14:13:28 +0000 (16:13 +0200)
committerKarel Zak <kzak@redhat.com>
Mon, 24 Aug 2015 08:55:41 +0000 (10:55 +0200)
Build warning:
sys-utils/hwclock-cmos.c: In function 'is_in_cpuinfo':
sys-utils/hwclock-cmos.c:162:4: warning: ignoring return value of 'fgets', declared with attribute warn_unused_result [-Wunused-result]
    fgets(field, 256, cpuinfo);

Full build log:
https://buildd.debian.org/status/fetch.php?pkg=util-linux&arch=alpha&ver=2.26.2-9&stamp=1440078034

Detected by/via:
https://qa.debian.org/bls/packages/u/util-linux.html

This change has never actually been (build-)tested on alpha, but
hopefully the change should fix the warning.

Signed-off-by: Andreas Henriksson <andreas@fatal.se>
sys-utils/hwclock-cmos.c

index 8d688083b3955b1df47927f4dd467d716d4d241c..de678ab9ef6b63d31bfc401a28e64cb29cfdc611 100644 (file)
@@ -152,15 +152,15 @@ static int is_in_cpuinfo(char *fmt, char *str)
 
        sprintf(format, "%s : %s", fmt, "%255s");
 
-       if ((cpuinfo = fopen("/proc/cpuinfo", "r")) != NULL) {
-               while (!feof(cpuinfo)) {
+       cpuinfo = fopen("/proc/cpuinfo", "r");
+       if (cpuinfo) {
+               do {
                        if (fscanf(cpuinfo, format, field) == 1) {
                                if (strncmp(field, str, strlen(str)) == 0)
                                        found = 1;
                                break;
                        }
-                       fgets(field, 256, cpuinfo);
-               }
+               } while (fgets(field, 256, cpuinfo));
                fclose(cpuinfo);
        }
        return found;