X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=client-src%2Fsendbackup-dump.c;h=254d86b128448d8f911852544f736bf30b245249;hb=refs%2Fheads%2Fmaster;hp=b0a8ec7ec236a66bc2755f0e30c960629dc840da;hpb=afaa71b3866b46b082b6c895772e15b36d8865fe;p=debian%2Famanda

diff --git a/client-src/sendbackup-dump.c b/client-src/sendbackup-dump.c
index b0a8ec7..254d86b 100644
--- a/client-src/sendbackup-dump.c
+++ b/client-src/sendbackup-dump.c
@@ -1,6 +1,7 @@
 /*
  * Amanda, The Advanced Maryland Automatic Network Disk Archiver
  * Copyright (c) 1991-1999 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
@@ -33,7 +34,6 @@
 #include "sendbackup.h"
 #include "getfsent.h"
 #include "clock.h"
-#include "version.h"
 
 #define LEAF_AND_DIRS "sed -e \'\ns/^leaf[ \t]*[0-9]*[ \t]*\\.//\nt\n/^dir[ \t]/ {\ns/^dir[ \t]*[0-9]*[ \t]*\\.//\ns%$%/%\nt\n}\nd\n\'"
 
@@ -144,14 +144,16 @@ start_backup(
     char *encryptopt = skip_argument;
     char *qdisk;
     char *config;
+    am_level_t *alevel = (am_level_t *)dle->levellist->data;
+    int      level  = alevel->level;
 
-    g_snprintf(level_str, SIZEOF(level_str), "%d", GPOINTER_TO_INT(dle->level->data));
+    g_snprintf(level_str, SIZEOF(level_str), "%d", level);
 
     qdisk = quote_string(dle->disk);
-    dbprintf(_("start: %s:%s lev %d\n"), host, qdisk, GPOINTER_TO_INT(dle->level->data));
+    dbprintf(_("start: %s:%s lev %d\n"), host, qdisk, level);
 
     g_fprintf(stderr, _("%s: start [%s:%s level %d]\n"),
-	    get_pname(), host, qdisk, GPOINTER_TO_INT(dle->level->data));
+	    get_pname(), host, qdisk, level);
     amfree(qdisk);
 
     /*  apply client-side encryption here */
@@ -208,7 +210,7 @@ start_backup(
     dbprintf(_("dumping device '%s' with '%s'\n"), device, fstype);
 
 #if defined(USE_RUNDUMP) || !defined(DUMP)
-    cmd = vstralloc(amlibexecdir, "/", "rundump", versionsuffix(), NULL);
+    cmd = vstralloc(amlibexecdir, "/", "rundump", NULL);
     cmdX = cmd;
     if (g_options->config)
 	config = g_options->config;
@@ -230,7 +232,7 @@ start_backup(
 #endif							/* } */
     {
         char *progname = cmd = newvstralloc(cmd, amlibexecdir, "/", "rundump",
-					    versionsuffix(), NULL);
+					    NULL);
 	cmdX = cmd;
 	if (g_options->config)
 	    config = g_options->config;
@@ -275,7 +277,7 @@ start_backup(
     {
 #ifdef USE_RUNDUMP
         char *progname = cmd = newvstralloc(cmd, amlibexecdir, "/", "rundump",
-					    versionsuffix(), NULL);
+					    NULL);
 	cmdX = cmd;
 	if (g_options->config)
 	    config = g_options->config;
@@ -325,8 +327,7 @@ start_backup(
     if (1)
 #endif
     {
-        char *progname = cmd = newvstralloc(cmd, amlibexecdir, "/", "rundump",
-					    versionsuffix(), NULL);
+        cmd = newvstralloc(cmd, amlibexecdir, "/", "rundump", NULL);
 	cmdX = cmd;
 	if (g_options->config)
 	    config = g_options->config;
@@ -350,7 +351,7 @@ start_backup(
 			     NULL);
 	info_tapeheader(dle);
 
-	start_index(dle->create-index, dumpout, mesgf, indexf, indexcmd);
+	start_index(dle->create_index, dumpout, mesgf, indexf, indexcmd);
 
 	dumppid = pipespawn(cmd, STDIN_PIPE, 0,
 			    &dumpin, &dumpout, &mesgf,