Imported Upstream version 3.2.0

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

diff --git a/server-src/amcleanupdisk.c b/server-src/amcleanupdisk.c
index 95dd3d377659714614137fbcbdc74770b83b5c4e..2ba6fb0d82b8f1181261416d7b6c302fc4b0b1dc 100644 (file)
--- a/server-src/amcleanupdisk.c
+++ b/server-src/amcleanupdisk.c
@@ -31,7 +31,6 @@
 #include "conffile.h"
 #include "diskfile.h"
 #include "clock.h"
-#include "version.h"
 #include "holding.h"
 #include "infofile.h"
 #include "server_util.h"
@@ -68,8 +67,8 @@ corrupt_dle(
        hostname, disk);
 
     get_info(hostname, disk, &info);
-    info.command &= ~FORCE_BUMP;
-    info.command |= FORCE_NO_BUMP;
+    CLR(info.command, FORCE_BUMP);
+    SET(info.command, FORCE_NO_BUMP);
     if(put_info(hostname, disk, &info)) {
        dbprintf(_("could not put info record for %s:%s: %s"),
              hostname, disk, strerror(errno));
@@ -103,7 +102,7 @@ main(
     dbopen(DBG_SUBDIR_SERVER);
 
     if(argc < 2) {
-       error(_("Usage: amcleanupdisk%s <config>"), versionsuffix());
+       error(_("Usage: amcleanupdisk <config>"));
        /*NOTREACHED*/
     }