Imported Upstream version 3.3.3

[debian/amanda] / xfer-src / filter-xor.c

diff --git a/xfer-src/filter-xor.c b/xfer-src/filter-xor.c
index 7bec75ea2713a22527a76ec7debb3e9860ebc2e3..f3f8a0f669754a19711ef3deb35143b6058ab2e9 100644 (file)
--- a/xfer-src/filter-xor.c
+++ b/xfer-src/filter-xor.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
@@ -91,7 +92,7 @@ pull_buffer_impl(
     if (elt->cancelled) {
        /* drain our upstream only if we're expecting an EOF */
        if (elt->expect_eof) {
-           xfer_element_drain_by_pulling(XFER_ELEMENT(self)->upstream);
+           xfer_element_drain_buffers(XFER_ELEMENT(self)->upstream);
        }
 
        /* return an EOF */
@@ -140,9 +141,9 @@ class_init(
 {
     XferElementClass *klass = XFER_ELEMENT_CLASS(selfc);
     static xfer_element_mech_pair_t mech_pairs[] = {
-       { XFER_MECH_PULL_BUFFER, XFER_MECH_PULL_BUFFER, 1, 0},
-       { XFER_MECH_PUSH_BUFFER, XFER_MECH_PUSH_BUFFER, 1, 0},
-       { XFER_MECH_NONE, XFER_MECH_NONE, 0, 0},
+       { XFER_MECH_PULL_BUFFER, XFER_MECH_PULL_BUFFER, XFER_NROPS(1), XFER_NTHREADS(0) },
+       { XFER_MECH_PUSH_BUFFER, XFER_MECH_PUSH_BUFFER, XFER_NROPS(1), XFER_NTHREADS(0) },
+       { XFER_MECH_NONE, XFER_MECH_NONE, XFER_NROPS(0), XFER_NTHREADS(0) },
     };
 
     klass->push_buffer = push_buffer_impl;