Imported Upstream version 3.3.3

[debian/amanda] / client-src / selfcheck.c

diff --git a/client-src/selfcheck.c b/client-src/selfcheck.c
index e044a6cd50fbc6febd1aad01a2f253d2bab5ea48..7716c89468e8ed656563d49708213ec9a6c2e442 100644 (file)
--- a/client-src/selfcheck.c
+++ b/client-src/selfcheck.c
@@ -1,6 +1,7 @@
 /*
  * Amanda, The Advanced Maryland Automatic Network Disk Archiver
  * Copyright (c) 1991-1998 University of Maryland at College Park
+ * Copyright (c) 2007-2012 Zmanda, Inc.  All Rights Reserved.
  * All Rights Reserved.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -95,7 +96,7 @@ main(
     dle_t *dle;
     int level;
     GSList *errlist;
-    level_t *alevel;
+    am_level_t *alevel;
 
     if (argc > 1 && argv && argv[1] && g_str_equal(argv[1], "--version")) {
        printf("selfcheck-%s\n", VERSION);
@@ -260,7 +261,7 @@ main(
        if (ch == '\0' || sscanf(s - 1, "%d", &level) != 1) {
            goto err;                           /* bad level */
        }
-       alevel = g_new0(level_t, 1);
+       alevel = g_new0(am_level_t, 1);
        alevel->level = level;
        dle->levellist = g_slist_append(dle->levellist, alevel);
        skip_integer(s, ch);
@@ -1232,8 +1233,7 @@ print_platform(void)
        FILE *release = fopen("/etc/lsb-release", "r");
        distro = "Ubuntu";
        if (release) {
-           char *result;
-           while ((result = fgets(line, 1024, release))) {
+           while (fgets(line, 1024, release)) {
                if (strstr(line, "DESCRIPTION")) {
                    platform = strchr(line, '=');
                    if (platform) platform++;
@@ -1280,8 +1280,8 @@ print_platform(void)
                    if (result) {
                        platform = line;
                    }
+                   fclose(release);
                }
-               fclose(release);
            }
            amfree(uname);
        }