Merge tag 'upstream/3.3.2'

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

diff --git a/client-src/sendsize.c b/client-src/sendsize.c
index 083ec65e665850744e800a033a0d7d4b82e854bd..a82637cefa559eaae0563628460977fc78e4aa47 100644 (file)
--- a/client-src/sendsize.c
+++ b/client-src/sendsize.c
@@ -135,7 +135,7 @@ main(
     char *qamdevice = NULL;
     dle_t *dle;
     GSList *errlist;
-    level_t *alevel;
+    am_level_t *alevel;
 
     (void)argc;        /* Quiet unused parameter warning */
     (void)argv;        /* Quiet unused parameter warning */
@@ -322,7 +322,7 @@ main(
            goto err;
        }
        skip_integer(s, ch);
-       alevel = g_new0(level_t, 1);
+       alevel = g_new0(am_level_t, 1);
        alevel->level = level;
        dle->levellist = g_slist_append(dle->levellist, alevel);
 
@@ -637,7 +637,7 @@ dle_add_diskest(
 
     levellist = dle->levellist;
     while (levellist != NULL) {
-       level_t *alevel = (level_t *)levellist->data;
+       am_level_t *alevel = (am_level_t *)levellist->data;
        if (alevel->level < 0)
            alevel->level = 0;
        if (alevel->level >= DUMP_LEVELS)
@@ -650,7 +650,7 @@ dle_add_diskest(
            /* already have disk info, just note the level request */
            levellist = dle->levellist;
            while (levellist != NULL) {
-               level_t *alevel = (level_t *)levellist->data;
+               am_level_t *alevel = (am_level_t *)levellist->data;
                int      level  = alevel->level;
                curp->est[level].needestimate = 1;
                curp->est[level].server = alevel->server;
@@ -677,7 +677,7 @@ dle_add_diskest(
     }
     levellist = dle->levellist;
     while (levellist != NULL) {
-       level_t *alevel = (level_t *)levellist->data;
+       am_level_t *alevel = (am_level_t *)levellist->data;
        newp->est[alevel->level].needestimate = 1;
        newp->est[alevel->level].server = alevel->server;
        levellist = g_slist_next(levellist);