patch to fix glib 2.32 build conflict

[debian/amanda] / common-src / fileheader-test.c

diff --git a/common-src/fileheader-test.c b/common-src/fileheader-test.c
index f2b26649ec28462450e895119793a355c806616e..ec8057d7043ba6b99f2c310f62ce5d604f03e1c1 100644 (file)
--- a/common-src/fileheader-test.c
+++ b/common-src/fileheader-test.c
@@ -70,6 +70,10 @@ rt_partnum(dumpfile_t *hdr)
        hdr->partnum = 2;
        hdr->totalparts = -1;
        if (!PREV_RT(hdr)) return 0;
+    } else if (hdr->type == F_DUMPFILE) {
+       hdr->partnum = 1;
+       hdr->totalparts = 1;
+       if (!PREV_RT(hdr)) return 0;
     } else {
        hdr->partnum = 0;
        hdr->totalparts = 0;
@@ -371,7 +375,7 @@ rt_type(dumpfile_t *hdr)
 }
 
 /* one function for each field; each fn calls the one above */
-static int
+static gboolean
 test_roundtrip(void)
 {
     int rv;
@@ -384,7 +388,7 @@ test_roundtrip(void)
 
     rv = PREV_RT(&hdr);
     tu_dbg("%d round-trips run\n", n_round_trips);
-    return rv;
+    return (rv) ? TRUE : FALSE;
 }
 
 /* doc