From 738402e0891c45412195bf23344a43f15597b554 Mon Sep 17 00:00:00 2001 From: Xiangfu Date: Mon, 24 Dec 2012 21:59:42 +0800 Subject: [PATCH] fix cppcheck warnings --- fp2bit.c | 4 +++- hstrrep.c | 1 + pair2net.c | 2 ++ sort_seq.c | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/fp2bit.c b/fp2bit.c index dab981c..3277acc 100644 --- a/fp2bit.c +++ b/fp2bit.c @@ -12,7 +12,7 @@ int main(int argc, char** argv) { struct fpga_model model; - FILE* fp, *fbits; + FILE *fbits, *fp = 0; int rc = -1; fbits = 0; @@ -45,9 +45,11 @@ int main(int argc, char** argv) if ((rc = read_floorplan(&model, fp))) goto fail; if ((rc = write_bitfile(fbits, &model))) goto fail; + fclose(fp); fclose(fbits); return EXIT_SUCCESS; fail: + if (fp) fclose(fp); if (fbits) fclose(fbits); return rc; } diff --git a/hstrrep.c b/hstrrep.c index f858284..cdf8878 100644 --- a/hstrrep.c +++ b/hstrrep.c @@ -106,5 +106,6 @@ int main(int argc, char** argv) fclose(fp); return EXIT_SUCCESS; xout: + if (fp) fclose(fp); return EXIT_FAILURE; } diff --git a/pair2net.c b/pair2net.c index 1a74597..063d2f6 100644 --- a/pair2net.c +++ b/pair2net.c @@ -197,7 +197,9 @@ int main(int argc, char** argv) if (rc) goto xout; rc = print_nets(nets, &connpt_names); if (rc) goto xout; + fclose(fp); return EXIT_SUCCESS; xout: + if(fp) fclose(fp); return EXIT_FAILURE; } diff --git a/sort_seq.c b/sort_seq.c index 49514fa..c9d8bca 100644 --- a/sort_seq.c +++ b/sort_seq.c @@ -419,7 +419,9 @@ int main(int argc, char** argv) } else s_numlines = 0; } + fclose(fp); return EXIT_SUCCESS; xout: + if(fp) fclose(fp); return EXIT_FAILURE; }