Fix invalid call to close().
authorBrenden Matthews <brenden@rty.ca>
Wed, 5 Aug 2009 05:06:13 +0000 (23:06 -0600)
committerBrenden Matthews <brenden@rty.ca>
Wed, 5 Aug 2009 05:06:13 +0000 (23:06 -0600)
src/conky.c
src/linux.c

index d45f208..0d08b40 100644 (file)
@@ -2148,7 +2148,7 @@ static struct text_object *construct_text_object(const char *s,
                        obj->type = OBJ_text;
                        return NULL;
                }
-               DBGP("parsed platform args: '%s' '%s' %d %f %f\n", buf1, buf2, n, factor, offset);
+               DBGP("parsed platform args: '%s' '%s' %d %f %f", buf1, buf2, n, factor, offset);
                obj->data.sysfs.fd = open_platform_sensor((*buf1) ? buf1 : 0, buf2, n,
                                &obj->data.sysfs.arg, obj->data.sysfs.devtype);
                strncpy(obj->data.sysfs.type, buf2, 63);
index bb78380..102f4da 100644 (file)
@@ -929,10 +929,9 @@ int open_sysfs_sensor(const char *dir, const char *dev, const char *type, int n,
                        divbuf[divn] = '\0';
                        *divisor = atoi(divbuf);
                }
+               close(divfd);
        }
 
-       close(divfd);
-
        return fd;
 }