From: Panu Matilainen <Panu Matilainen pmatilai@redhat.com>
Date: Fri, 8 Jul 2011 11:48:54 +0000 (+0300)
Subject: Fix totally broken Fflush() operation
X-Git-Tag: tznext/4.11.0.1.tizen20130304~963
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=501c6c4b2003deaf286a6853b26c92193bb8f8ff;p=tools%2Flibrpm-tizen.git

Fix totally broken Fflush() operation

- This only ever worked for fpio, for all other types it returns
  bogons or crashes and burns.
- Use the file op vectors to find our fflush function instead
  of #ifdef/#endif if/else/ifelse jungle.
- Notably fdio and ufdio do not have a fflush() equivalent because
  they dont need one. Use a dummy function to always return success to
  differentiate from -2 aka "not supported by this io type"
---

diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c
index 7ce6a05..4d80d84 100644
--- a/rpmio/rpmio.c
+++ b/rpmio/rpmio.c
@@ -336,6 +336,12 @@ static int fdSeekNot(void * cookie, off_t pos,  int whence)
     return -2;
 }
 
+/* Regular fd doesn't have fflush() equivalent but its not an error either */
+static int fdFlush(FD_t fd)
+{
+    return 0;
+}
+
 /** \ingroup rpmio
  */
 static int fdFileno(void * cookie)
@@ -541,7 +547,7 @@ DBGIO(fd, (stderr, "==>\tfdOpen(\"%s\",%x,0%o) %s\n", path, (unsigned)flags, (un
 
 static const struct FDIO_s fdio_s = {
   fdRead, fdWrite, fdSeek, fdClose, fdLink, fdFree, fdNew, fdFileno,
-  fdOpen, NULL, fdGetFp, NULL
+  fdOpen, NULL, fdGetFp, fdFlush
 };
 static const FDIO_t fdio = &fdio_s ;
 
@@ -658,7 +664,7 @@ DBGIO(fd, (stderr, "==>\tufdOpen(\"%s\",%x,0%o) %s\n", url, (unsigned)flags, (un
 
 static const struct FDIO_s ufdio_s = {
   fdRead, fdWrite, fdSeek, fdClose, fdLink, fdFree, fdNew, fdFileno,
-  ufdOpen, NULL, fdGetFp, NULL
+  ufdOpen, NULL, fdGetFp, fdFlush
 };
 static const FDIO_t ufdio = &ufdio_s ;
 
@@ -1633,22 +1639,13 @@ fprintf(stderr, "*** Fopen WTFO path %s fmode %s\n", path, fmode);
 
 int Fflush(FD_t fd)
 {
-    void * vh;
-    if (fd == NULL) return -1;
+    int rc = -1;
+    if (fd != NULL) {
+	fdio_fflush_function_t _fflush = FDIOVEC(fd, _fflush);
 
-    vh = fdGetFp(fd);
-    if (vh && fdGetIo(fd) == gzdio)
-	return gzdFlush(vh);
-#if HAVE_BZLIB_H
-    if (vh && fdGetIo(fd) == bzdio)
-	return bzdFlush(vh);
-#endif
-#if HAVE_LZMA_H
-    if (vh && (fdGetIo(fd) == xzdio || fdGetIo(fd) == lzdio))
-	return lzdFlush(vh);
-#endif
-/* FIXME: If we get here, something went wrong above */
-    return 0;
+	rc = (_fflush ? _fflush(fd) : -2);
+    }
+    return rc;
 }
 
 off_t Ftell(FD_t fd)