Hi! Rebased and pushed with a few cosmetic changes (see below), thanks. > +int file_scanf(const char *file, const int lineno, > + const char *path, const char *fmt, ...) > +{ > + va_list va; > + FILE *f; > + int exp_convs, ret; > + > + f = fopen(path, "r"); > + > + if (f == NULL) { > + tst_resm(TWARN, > + "Failed to close FILE '%s' at %s:%d", ^ open > + path, file, lineno); > + return 1; > + } > +
... > + if (fclose(f)) { > + tst_resm(TWARN, > + "Failed to close FILE '%s' at %s:%d", > + path, file, lineno); > + return 1; > + } > + > + return 0; > + > +err: > + if (fclose(f)) { > + tst_resm(TWARN, > + "Failed to close FILE '%s' at %s:%d", > + path, file, lineno); > + return 1; ^ This is not needed because of the return 1 right below. > + } > + return 1; > +} -- Cyril Hrubis chru...@suse.cz ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk _______________________________________________ Ltp-list mailing list Ltp-list@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/ltp-list