projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 3.3.1
[debian/amanda]
/
device-src
/
xfer-dest-taper-splitter.c
diff --git
a/device-src/xfer-dest-taper-splitter.c
b/device-src/xfer-dest-taper-splitter.c
index 561f04dccaead748572865aae8ed20df0d75d668..ccd7fdec5deb6dae76362f4bf55700d53e060334 100644
(file)
--- a/
device-src/xfer-dest-taper-splitter.c
+++ b/
device-src/xfer-dest-taper-splitter.c
@@
-181,7
+181,7
@@
_xdt_dbg(const char *fmt, ...)
arglist_start(argp, fmt);
g_vsnprintf(msg, sizeof(msg), fmt, argp);
arglist_end(argp);
arglist_start(argp, fmt);
g_vsnprintf(msg, sizeof(msg), fmt, argp);
arglist_end(argp);
- g_debug("XDT
thd-%p: %s", g_thread_self()
, msg);
+ g_debug("XDT
: %s"
, msg);
}
/* "Fast forward" the slice list by the given length. This will free any
}
/* "Fast forward" the slice list by the given length. This will free any
@@
-551,11
+551,6
@@
part_done:
}
}
}
}
- if (elt->cancelled) {
- g_timer_destroy(timer);
- return NULL;
- }
-
g_timer_stop(timer);
msg = xmsg_new(XFER_ELEMENT(self), XMSG_PART_DONE, 0);
g_timer_stop(timer);
msg = xmsg_new(XFER_ELEMENT(self), XMSG_PART_DONE, 0);
@@
-564,7
+559,7
@@
part_done:
msg->partnum = self->partnum;
msg->fileno = fileno;
msg->successful = self->last_part_successful = part_status != PART_FAILED;
msg->partnum = self->partnum;
msg->fileno = fileno;
msg->successful = self->last_part_successful = part_status != PART_FAILED;
- msg->eom = self->last_part_eom =
(part_status == PART_LEOM || !msg->successful)
;
+ msg->eom = self->last_part_eom =
part_status == PART_LEOM || self->device->is_eom
;
msg->eof = self->last_part_eof = part_status == PART_EOF;
/* time runs backward on some test boxes, so make sure this is positive */
msg->eof = self->last_part_eof = part_status == PART_EOF;
/* time runs backward on some test boxes, so make sure this is positive */