Whamcloud - gitweb
Remove trailing whitespace for the entire source tree
[tools/e2fsprogs.git] / lib / blkid / save.c
index f52dc46..656bb0b 100644 (file)
@@ -34,11 +34,12 @@ static int save_dev(blkid_dev dev, FILE *file)
                return 0;
 
        DBG(DEBUG_SAVE,
-           printf("device %s, type %s\n", dev->bid_name, dev->bid_type));
+           printf("device %s, type %s\n", dev->bid_name, dev->bid_type ?
+                  dev->bid_type : "(null)"));
 
        fprintf(file,
                "<device DEVNO=\"0x%04lx\" TIME=\"%ld\"",
-               (unsigned long) dev->bid_devno, dev->bid_time);
+               (unsigned long) dev->bid_devno, (long) dev->bid_time);
        if (dev->bid_pri)
                fprintf(file, " PRI=\"%d\"", dev->bid_pri);
        list_for_each(p, &dev->bid_tags) {
@@ -180,7 +181,7 @@ int main(int argc, char **argv)
                exit(1);
        }
        cache->bic_filename = blkid_strdup(argv[1]);
-       
+
        if ((ret = blkid_flush_cache(cache)) < 0) {
                fprintf(stderr, "error (%d) saving cache\n", ret);
                exit(1);