From 0e8db956e39a0d95da7be7c9286d77dd1d9eed82 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Tue, 9 Oct 2007 12:42:27 +0300 Subject: [PATCH] Remove unused legacy rpmio fd*() interfaces - fdFileno(), fdOpen(), fdRead(), fdWrite(), fdClose() gone... --- rpmio/rpmio.c | 34 ---------------------------------- rpmio/rpmio.h | 20 -------------------- 2 files changed, 54 deletions(-) diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c index 620cd45..7ace216 100644 --- a/rpmio/rpmio.c +++ b/rpmio/rpmio.c @@ -176,12 +176,6 @@ int __fdFileno(void * cookie) return fd->fps[0].fdno; } -/** - */ -int fdFileno(void * cookie) { - return fdio->_fileno(cookie); -} - /* =============================================================== */ /** @@ -288,13 +282,6 @@ FD_t XfdNew(const char * msg, const char * file, unsigned line) /** */ -ssize_t fdRead(void * cookie, char * buf, size_t count) -{ - return fdio->read(cookie, buf, count); -} - -/** - */ static ssize_t __fdRead(void * cookie, char * buf, size_t count) { FD_t fd = c2f(cookie); @@ -315,13 +302,6 @@ DBGIO(fd, (stderr, "==>\t__fdRead(%p,%p,%ld) rc %ld %s\n", cookie, buf, (long)co /** */ -ssize_t fdWrite(void * cookie, const char * buf, size_t count) -{ - return fdio->write(cookie, buf, count); -} - -/** - */ static ssize_t __fdWrite(void * cookie, const char * buf, size_t count) { FD_t fd = c2f(cookie); @@ -365,13 +345,6 @@ DBGIO(fd, (stderr, "==>\tfdSeek(%p,%ld,%d) rc %lx %s\n", cookie, (long)p, whence /** */ -int fdClose( void * cookie) -{ - return fdio->close(cookie); -} - -/** - */ static int __fdClose( void * cookie) { FD_t fd; @@ -396,13 +369,6 @@ DBGIO(fd, (stderr, "==>\t__fdClose(%p) rc %lx %s\n", (fd ? fd : NULL), (unsigned /** */ -FD_t fdOpen(const char *path, int flags, mode_t mode) -{ - return fdio->_open(path, flags, mode); -} - -/** - */ static FD_t __fdOpen(const char *path, int flags, mode_t mode) { FD_t fd; diff --git a/rpmio/rpmio.h b/rpmio/rpmio.h index 1c755c4..6ca1367 100644 --- a/rpmio/rpmio.h +++ b/rpmio/rpmio.h @@ -344,26 +344,6 @@ FD_t fdDup(int fdno); /** */ -extern int fdFileno(void * cookie); - -/** - */ -extern FD_t fdOpen(const char *path, int flags, mode_t mode); - -/** - */ -extern ssize_t fdRead(void * cookie, char * buf, size_t count); - -/** - */ -extern ssize_t fdWrite(void * cookie, const char * buf, size_t count); - -/** - */ -extern int fdClose( void * cookie); - -/** - */ extern FD_t fdLink (void * cookie, const char * msg); /** -- 2.7.4