projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
capture bug closures in changelog
[debian/amanda]
/
xfer-src
/
source-fd.c
diff --git
a/xfer-src/source-fd.c
b/xfer-src/source-fd.c
index a0ad8873e8152c2d5a0a958c1a89310384e34c4d..fedeba6a98ae507e8825ecac739c8ea024b04b52 100644
(file)
--- a/
xfer-src/source-fd.c
+++ b/
xfer-src/source-fd.c
@@
-1,6
+1,6
@@
/*
* Amanda, The Advanced Maryland Automatic Network Disk Archiver
/*
* 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
*
* 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
*/
* Sunnyvale, CA 94085, USA, or: http://www.zmanda.com
*/
-#include "amxfer.h"
#include "amanda.h"
#include "amanda.h"
+#include "amxfer.h"
/*
* Class declaration
/*
* Class declaration
@@
-65,8
+65,8
@@
class_init(
{
XferElementClass *klass = XFER_ELEMENT_CLASS(selfc);
static xfer_element_mech_pair_t mech_pairs[] = {
{
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";
};
klass->perl_class = "Amanda::Xfer::Source::Fd";
@@
-112,7
+112,7
@@
xfer_source_fd(
/* we read from a *copy* of this file descriptor, as the downstream element
* will close output_fd on EOF */
/* 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;
}
return elt;
}