From dec32b0bb4777a1af24f3eedcf817f12762824a1 Mon Sep 17 00:00:00 2001 From: Fufu Fang Date: Tue, 22 Oct 2019 01:13:28 +0100 Subject: [PATCH] removed main.c's extra warning messages when doing exit(EXIT_FAILURE) --- src/link.c | 2 +- src/link.h | 5 +++++ src/main.c | 6 +++--- src/sonic.c | 5 +++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/link.c b/src/link.c index 17fb088..fbd897a 100644 --- a/src/link.c +++ b/src/link.c @@ -284,7 +284,7 @@ void LinkTable_free(LinkTable *linktbl) free(linktbl); } -static void LinkTable_print(LinkTable *linktbl) +void LinkTable_print(LinkTable *linktbl) { int j = 0; fprintf(stderr, "--------------------------------------------\n"); diff --git a/src/link.h b/src/link.h index c59c0f0..1779fc3 100644 --- a/src/link.h +++ b/src/link.h @@ -154,4 +154,9 @@ LinkTable *LinkTable_alloc(const char *url); */ void LinkTable_free(LinkTable *linktbl); +/** + * \brief print a LinkTable + */ +void LinkTable_print(LinkTable *linktbl); + #endif diff --git a/src/main.c b/src/main.c index 2adcba4..2bf379f 100644 --- a/src/main.c +++ b/src/main.c @@ -20,7 +20,7 @@ int main(int argc, char **argv) if (argc < 2) { print_help(argv[0], 0); fprintf(stderr, "For more information, run \"%s --help.\"\n", argv[0]); - exit_failure(); + exit(EXIT_FAILURE); } /* These are passed into fuse initialiser */ @@ -62,11 +62,11 @@ int main(int argc, char **argv) if (strncmp(base_url, "http://", 7) && strncmp(base_url, "https://", 8)) { fprintf(stderr, "Error: Please supply a valid URL.\n"); print_help(argv[0], 0); - exit_failure(); + exit(EXIT_FAILURE); } else { if(!network_init(base_url)) { fprintf(stderr, "Error: Network initialisation failed.\n"); - exit_failure(); + exit(EXIT_FAILURE); } } diff --git a/src/sonic.c b/src/sonic.c index ee46618..d011543 100644 --- a/src/sonic.c +++ b/src/sonic.c @@ -4,7 +4,7 @@ #include "link.h" #include "network.h" - +#include #include #include @@ -97,8 +97,9 @@ LinkTable *sonic_LinkTable_new(const int id) return NULL; } + printf("%s", buf.memory); - + free(buf.memory); free(url); return NULL; }