Eliminate bogus ferror() checks

- fopen() returns NULL on errors, never an opened stream with error
  flag set. These are leftovers from past where rpmio fd was used
  instead of FILE and probably the checks were bogus even back then too.

diff --git a/build/files.c b/build/files.c
index 8d7fb2e..0366443 100644 (file)
--- a/build/files.c
+++ b/build/files.c
@@ -1733,7 +1733,7 @@ static rpmRC processPackageFiles(rpmSpec spec, rpmBuildPkgFlags pkgFlags,
            }
            fd = fopen(ffn, "r");
 
-           if (fd == NULL || ferror(fd)) {
+           if (fd == NULL) {
                rpmlog(RPMLOG_ERR, _("Could not open %%files file %s: %m\n"), ffn);
                return RPMRC_FAIL;
            }

diff --git a/build/pack.c b/build/pack.c
index 8b06db2..ee4cfc9 100644 (file)
--- a/build/pack.c
+++ b/build/pack.c
@@ -127,7 +127,7 @@ static StringBuf addFileToTagAux(rpmSpec spec,
     fn = rpmGetPath("%{_builddir}/%{?buildsubdir:%{buildsubdir}/}", file, NULL);
 
     f = fopen(fn, "r");
-    if (f == NULL || ferror(f)) {
+    if (f == NULL) {
        sb = freeStringBuf(sb);
        goto exit;
     }

diff --git a/build/parseSpec.c b/build/parseSpec.c
index 8f2db6d..4df957f 100644 (file)
--- a/build/parseSpec.c
+++ b/build/parseSpec.c
@@ -240,8 +240,7 @@ retry:
     /* Make sure the current file is open */
     if (ofi->fp == NULL) {
        ofi->fp = fopen(ofi->fileName, "r");
-       if (ofi->fp == NULL || ferror(ofi->fp)) {
-           /* XXX Fstrerror */
+       if (ofi->fp == NULL) {
            rpmlog(RPMLOG_ERR, _("Unable to open %s: %s\n"),
                     ofi->fileName, strerror(errno));
            return PART_ERROR;

diff --git a/rpmbuild.c b/rpmbuild.c
index 856798a..dcdf3d4 100644 (file)
--- a/rpmbuild.c
+++ b/rpmbuild.c
@@ -245,7 +245,7 @@ static int isSpecFile(const char * specfile)
     int checking;
 
     f = fopen(specfile, "r");
-    if (f == NULL || ferror(f)) {
+    if (f == NULL) {
        rpmlog(RPMLOG_ERR, _("Unable to open spec file %s: %s\n"),
                specfile, strerror(errno));
        return 0;

diff --git a/rpmio/macro.c b/rpmio/macro.c
index d79ef18..8de886c 100644 (file)
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@@ -1463,10 +1463,8 @@ rpmLoadMacroFile(rpmMacroContext mc, const char * fn)
     char *buf = xmalloc(blen);
     int rc = -1;
 
-    if (fd == NULL || ferror(fd)) {
-       if (fd) (void) fclose(fd);
+    if (fd == NULL)
        goto exit;
-    }
 
     /* XXX Assume new fangled macro expansion */
     max_macro_depth = 16;