readahead-analyze: don't call fclose on null

[elogind.git] / src / readahead / readahead-analyze.c

diff --git a/src/readahead/readahead-analyze.c b/src/readahead/readahead-analyze.c
index 8f1d7f9c4fa188442c67585c47e88bf0660361df..9a929c0937f9cf212196bc545d531fbb4997bac3 100644 (file)
--- a/src/readahead/readahead-analyze.c
+++ b/src/readahead/readahead-analyze.c
@@ -115,7 +115,7 @@ int main_analyze(const char *pack_path) {
                         tsize += size;
 
                         printf("  %4d%% (%2d) %12ld: %s\n",
-                                sections ? (int)(size / st.st_size * 100.0) : 100,
+                                sections ? (int) (size * 100 / st.st_size) : 100,
                                 sections ? sections : 1,
                                 (unsigned long)size,
                                 path);
@@ -135,15 +135,16 @@ int main_analyze(const char *pack_path) {
         printf("\nHOST:    %s"
                "TYPE:    %c\n"
                "MISSING: %d\n"
-               "TOTAL:   %ld\n",
+               "TOTAL:   %llu\n",
                line,
                a,
                missing,
-               tsize);
+               (unsigned long long) tsize);
 
         return EXIT_SUCCESS;
 
 fail:
-        fclose(pack);
+        if(pack)
+                fclose(pack);
         return EXIT_FAILURE;
 }