Imported Upstream version 2.6.0

[debian/amanda] / server-src / tapefile.c

diff --git a/server-src/tapefile.c b/server-src/tapefile.c
index 1b2e7c6e1323d2194452009c1954cd4a0ded03b9..ce120d06647ed2e0ae3016d93aea93a23b0d0b89 100644 (file)
--- a/server-src/tapefile.c
+++ b/server-src/tapefile.c
@@ -92,14 +92,14 @@ write_tapelist(
     }
 
     for(tp = tape_list; tp != NULL; tp = tp->next) {
-       fprintf(tapef, "%s %s", tp->datestamp, tp->label);
-       if(tp->reuse) fprintf(tapef, " reuse");
-       else fprintf(tapef, " no-reuse");
-       fprintf(tapef, "\n");
+       g_fprintf(tapef, "%s %s", tp->datestamp, tp->label);
+       if(tp->reuse) g_fprintf(tapef, " reuse");
+       else g_fprintf(tapef, " no-reuse");
+       g_fprintf(tapef, "\n");
     }
 
     if (fclose(tapef) == EOF) {
-       fprintf(stderr,"error [closing %s: %s]", newtapefile, strerror(errno));
+       g_fprintf(stderr,_("error [closing %s: %s]"), newtapefile, strerror(errno));
        amfree(newtapefile);
        return 1;
     }
@@ -362,14 +362,10 @@ parse_tapeline(
 
     skip_whitespace(s, ch);
     tp->reuse = 1;
-#define sc "reuse"
-    if(strncmp(s - 1, sc, SIZEOF(sc)-1) == 0)
+    if(strncmp_const(s - 1, "reuse") == 0)
        tp->reuse = 1;
-#undef sc
-#define sc "no-reuse"
-    if(strncmp(s - 1, sc, SIZEOF(sc)-1) == 0)
+    if(strncmp_const(s - 1, "no-reuse") == 0)
        tp->reuse = 0;
-#undef sc
 
     return tp;
 }