X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=xfer-src%2Fsource-fd.c;h=0f8bf69832b58b98dbeaa77ee1c77a3aab39bf07;hb=refs%2Fheads%2Fmaster;hp=a0ad8873e8152c2d5a0a958c1a89310384e34c4d;hpb=fd48f3e498442f0cbff5f3606c7c403d0566150e;p=debian%2Famanda

diff --git a/xfer-src/source-fd.c b/xfer-src/source-fd.c
index a0ad887..0f8bf69 100644
--- a/xfer-src/source-fd.c
+++ b/xfer-src/source-fd.c
@@ -1,10 +1,11 @@
 /*
  * 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
- * by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -19,8 +20,8 @@
  * Sunnyvale, CA 94085, USA, or: http://www.zmanda.com
  */
 
-#include "amxfer.h"
 #include "amanda.h"
+#include "amxfer.h"
 
 /*
  * Class declaration
@@ -65,8 +66,8 @@ class_init(
 {
     XferElementClass *klass = XFER_ELEMENT_CLASS(selfc);
     static xfer_element_mech_pair_t mech_pairs[] = {
-	{ XFER_MECH_NONE, XFER_MECH_READFD, 0, 0},
-	{ XFER_MECH_NONE, XFER_MECH_NONE, 0, 0},
+	{ XFER_MECH_NONE, XFER_MECH_READFD, XFER_NROPS(0), XFER_NTHREADS(0) },
+	{ XFER_MECH_NONE, XFER_MECH_NONE, XFER_NROPS(0), XFER_NTHREADS(0) },
     };
 
     klass->perl_class = "Amanda::Xfer::Source::Fd";
@@ -112,7 +113,7 @@ xfer_source_fd(
 
     /* we read from a *copy* of this file descriptor, as the downstream element
      * will close output_fd on EOF */
-    elt->output_fd = dup(fd);
+    g_assert(xfer_element_swap_output_fd(elt, dup(fd)) == -1);
 
     return elt;
 }