Merge branch 'upstream'

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

diff --git a/client-src/sendsize.c b/client-src/sendsize.c
index 97b28571ad5bcd7120effd66359b4ab13957a89b..8c64f63ac1563ebac01affcedd07486bc79520a0 100644 (file)
--- a/client-src/sendsize.c
+++ b/client-src/sendsize.c
@@ -169,6 +169,10 @@ main(
     /* Don't die when child closes pipe */
     signal(SIGPIPE, SIG_IGN);
 
+#if defined(USE_DBMALLOC)
+    malloc_size_1 = malloc_inuse(&malloc_hist_1);
+#endif
+
     erroutput_type = (ERR_INTERACTIVE|ERR_SYSLOG);
     dbopen(DBG_SUBDIR_CLIENT);
     startclock();
@@ -1087,7 +1091,7 @@ getsize_dump(
     char       *disk,
     char       *amdevice,
     int                level,
-    option_t   *options,
+    option_t   *options G_GNUC_UNUSED,
     char      **errmsg)
 {
     int pipefd[2], nullfd, stdoutfd, killctl[2];
@@ -1112,10 +1116,6 @@ getsize_dump(
     int is_rundump = 1;
 #endif
 
-    (void)options;     /* Quiet unused parameter warning */
-
-    (void)getsize_smbtar;      /* Quiet unused parameter warning */
-
     g_snprintf(level_str, SIZEOF(level_str), "%d", level);
 
     device = amname_to_devname(amdevice);