Sophie

Sophie

distrib > Mandriva > 2008.0 > x86_64 > by-pkgid > a35732d620cfac4812adc8d6b2992f07 > files > 52

rpm-4.4.8-22.1mdv2008.0.src.rpm

Index: build/pack.c
===================================================================
--- build/pack.c
+++ build/pack.c	2007-03-04 22:32:07.897983911 +0100
@@ -135,18 +135,16 @@
     char buf[BUFSIZ];
     const char * fn = buf;
     FILE * f;
-    FD_t fd;
 
     fn = rpmGetPath("%{_builddir}/%{?buildsubdir:%{buildsubdir}/}", file, NULL);
 
-    fd = Fopen(fn, "r");
-    if (fn != buf) fn = _free(fn);
-    if (fd == NULL || Ferror(fd)) {
+    f = fopen(fn, "r"); 
+    if (fn != buf) fn = _free(fn); 
+    if (f == NULL) {
 	sb = freeStringBuf(sb);
 	return NULL;
     }
     /*@-type@*/ /* FIX: cast? */
-    if ((f = fdGetFp(fd)) != NULL)
     /*@=type@*/
     while (fgets(buf, sizeof(buf), f)) {
 	/* XXX display fn in error msg */
@@ -157,7 +155,7 @@
 	}
 	appendStringBuf(sb, buf);
     }
-    (void) Fclose(fd);
+    (void) fclose(f);
 
     return sb;
 }