summaryrefslogtreecommitdiff
path: root/src/apk_io.h
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2020-01-06 01:14:28 +0200
committerTimo Teräs <timo.teras@iki.fi>2020-01-06 01:17:08 +0200
commit3cd7d1e077ad945dfe789a6e2a337ec8849fc342 (patch)
tree1f3dbc5870ed7e6732ea0a4b0645e3ff631a3aaf /src/apk_io.h
parente39334e44f723b0a1d1036f354c5d8f5d0a12377 (diff)
downloadapk-tools-3cd7d1e077ad945dfe789a6e2a337ec8849fc342.tar.gz
apk-tools-3cd7d1e077ad945dfe789a6e2a337ec8849fc342.tar.bz2
apk-tools-3cd7d1e077ad945dfe789a6e2a337ec8849fc342.tar.xz
apk-tools-3cd7d1e077ad945dfe789a6e2a337ec8849fc342.zip
io: remove the now unused pid association with istream
Diffstat (limited to 'src/apk_io.h')
-rw-r--r--src/apk_io.h13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/apk_io.h b/src/apk_io.h
index cfe4a29..2bb0f26 100644
--- a/src/apk_io.h
+++ b/src/apk_io.h
@@ -106,9 +106,9 @@ static inline struct apk_istream *apk_bstream_gunzip(struct apk_bstream *bs)
struct apk_ostream *apk_ostream_gzip(struct apk_ostream *);
struct apk_ostream *apk_ostream_counter(off_t *);
-struct apk_istream *apk_istream_from_fd_pid(int fd, pid_t pid, int (*translate_status)(int));
struct apk_istream *apk_istream_from_file(int atfd, const char *file);
struct apk_istream *apk_istream_from_file_gz(int atfd, const char *file);
+struct apk_istream *apk_istream_from_fd(int fd);
struct apk_istream *apk_istream_from_fd_url_if_modified(int atfd, const char *url, time_t since);
struct apk_istream *apk_istream_from_url_gz(const char *url);
ssize_t apk_istream_skip(struct apk_istream *istream, size_t size);
@@ -117,10 +117,6 @@ ssize_t apk_istream_skip(struct apk_istream *istream, size_t size);
ssize_t apk_istream_splice(struct apk_istream *is, int fd, size_t size,
apk_progress_cb cb, void *cb_ctx);
-static inline struct apk_istream *apk_istream_from_fd(int fd)
-{
- return apk_istream_from_fd_pid(fd, 0, NULL);
-}
static inline struct apk_istream *apk_istream_from_url(const char *url)
{
return apk_istream_from_fd_url_if_modified(AT_FDCWD, url, 0);
@@ -147,17 +143,12 @@ static inline void apk_istream_close(struct apk_istream *is)
}
struct apk_bstream *apk_bstream_from_istream(struct apk_istream *istream);
-struct apk_bstream *apk_bstream_from_fd_pid(int fd, pid_t pid, int (*translate_status)(int));
struct apk_bstream *apk_bstream_from_file(int atfd, const char *file);
+struct apk_bstream *apk_bstream_from_fd(int fd);
struct apk_bstream *apk_bstream_from_fd_url_if_modified(int atfd, const char *url, time_t since);
struct apk_bstream *apk_bstream_tee(struct apk_bstream *from, int atfd, const char *to, int copy_meta,
apk_progress_cb cb, void *cb_ctx);
-static inline struct apk_bstream *apk_bstream_from_fd(int fd)
-{
- return apk_bstream_from_fd_pid(fd, 0, NULL);
-}
-
static inline struct apk_bstream *apk_bstream_from_url(const char *url)
{
return apk_bstream_from_fd_url_if_modified(AT_FDCWD, url, 0);