Imported Upstream version 3.3.2

[debian/amanda] / xfer-src / dest-fd.c

diff --git a/xfer-src/dest-fd.c b/xfer-src/dest-fd.c
index cf8c46448cc0e5d45a687029f7898f328612f543..962d3dd4aee6f668e1c079ab50d1efe32bff43ef 100644 (file)
--- a/xfer-src/dest-fd.c
+++ b/xfer-src/dest-fd.c
@@ -1,6 +1,6 @@
 /*
  * Amanda, The Advanced Maryland Automatic Network Disk Archiver
- * Copyright (c) 2008,2009 Zmanda, Inc.  All Rights Reserved.
+ * Copyright (c) 2008-2012 Zmanda, Inc.  All Rights Reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
@@ -19,8 +19,8 @@
  * Sunnyvale, CA 94085, USA, or: http://www.zmanda.com
  */
 
-#include "amxfer.h"
 #include "amanda.h"
+#include "amxfer.h"
 
 /*
  * Class declaration
@@ -65,8 +65,8 @@ class_init(
 {
     XferElementClass *klass = XFER_ELEMENT_CLASS(selfc);
     static xfer_element_mech_pair_t mech_pairs[] = {
-       { XFER_MECH_WRITEFD, XFER_MECH_NONE, 0, 0},
-       { XFER_MECH_NONE, XFER_MECH_NONE, 0, 0},
+       { XFER_MECH_WRITEFD, XFER_MECH_NONE, XFER_NROPS(0), XFER_NTHREADS(0) },
+       { XFER_MECH_NONE, XFER_MECH_NONE, XFER_NROPS(0), XFER_NTHREADS(0) },
     };
 
     klass->perl_class = "Amanda::Xfer::Dest::Fd";
@@ -110,9 +110,9 @@ xfer_dest_fd(
 
     g_assert(fd >= 0);
 
-    /* We keep a *copy* of this fd, because our caller will close it to indicate
-     * EOF */
-    elt->input_fd = dup(fd);
+    /* We keep a *copy* of this fd, because our caller will close it to
+     * indicate EOF */
+    g_assert(xfer_element_swap_input_fd(elt, dup(fd)) == -1);
 
     return elt;
 }