diff options
| -rw-r--r-- | bin/gensquashfs/src/fstree_from_file.c | 2 | ||||
| -rw-r--r-- | bin/tar2sqfs/src/process_tarball.c | 2 | ||||
| -rw-r--r-- | lib/io/src/xfrm/ostream.c | 7 |
3 files changed, 1 insertions, 10 deletions
diff --git a/bin/gensquashfs/src/fstree_from_file.c b/bin/gensquashfs/src/fstree_from_file.c index 297db31..a5c6e53 100644 --- a/bin/gensquashfs/src/fstree_from_file.c +++ b/bin/gensquashfs/src/fstree_from_file.c @@ -191,7 +191,7 @@ fail_alloc: return -1; fail_root: fprintf(stderr, "%s: " PRI_SZ ": cannot use / as argument for %s.\n", - filename, line_num, is_glob ? "glob" : cb->keyword); + filename, line_num, cb->keyword); return -1; fail_no_extra: fprintf(stderr, "%s: " PRI_SZ ": missing argument for %s.\n", diff --git a/bin/tar2sqfs/src/process_tarball.c b/bin/tar2sqfs/src/process_tarball.c index 3b9365d..e0326ee 100644 --- a/bin/tar2sqfs/src/process_tarball.c +++ b/bin/tar2sqfs/src/process_tarball.c @@ -224,8 +224,6 @@ int process_tarball(sqfs_dir_iterator_t *it, sqfs_writer_t *sqfs) if (is_root) { ret = set_root_attribs(sqfs, it, ent); - } else if (skip) { - ret = dont_skip ? -1 : 0; } else { ret = create_node_and_repack_data(sqfs, it, ent, link); } diff --git a/lib/io/src/xfrm/ostream.c b/lib/io/src/xfrm/ostream.c index c035f2a..2b42084 100644 --- a/lib/io/src/xfrm/ostream.c +++ b/lib/io/src/xfrm/ostream.c @@ -51,13 +51,6 @@ static int flush_inbuf(ostream_xfrm_t *xfrm, bool finish) break; } - if (off_out > 0) { - ret = xfrm->wrapped->append(xfrm->wrapped, - xfrm->outbuf, off_out); - if (ret) - return ret; - } - if (off_in < avail_in) { memmove(xfrm->inbuf, xfrm->inbuf + off_in, avail_in - off_in); xfrm->inbuf_used -= off_in; |