From 956a6261ebfdf8fb3346b8935d0ec59c1c26df7c Mon Sep 17 00:00:00 2001 From: David Phillips Date: Tue, 1 Sep 2015 17:23:34 +1200 Subject: Cleaning up common functions --- common.c | 43 +++++++++++-------------------------------- 1 file changed, 11 insertions(+), 32 deletions(-) (limited to 'common.c') diff --git a/common.c b/common.c index 46a3105..ecff03c 100644 --- a/common.c +++ b/common.c @@ -21,6 +21,9 @@ #include +/*********************************************************************** + * Return integer value from first line in file (formatted filename) + **********************************************************************/ int get_int_value_from_filef(const char* format, ...) { int value = 0; @@ -32,6 +35,10 @@ int get_int_value_from_filef(const char* format, ...) return value; } + +/*********************************************************************** + * va_list wrapper function for get_int_value_from_filef() + **********************************************************************/ int vget_int_value_from_filef(const char* format, va_list args) { @@ -62,44 +69,16 @@ int get_int_value_from_file(const char* filename) } -/*********************************************************************** - * Return true/false if a file has specified line of text - **********************************************************************/ -bool file_has_line(const char *filename, const char *line) -{ - FILE* fd; - char buffer[4096]; - - if (!(fd = fopen(filename, "r"))) - return false; - - while (fgets(buffer, sizeof(buffer), fd) != NULL) - { - if(strstr(buffer, line) != NULL) - { - fclose(fd); - return true; - } - } - fclose(fd); - return false; -} - /*********************************************************************** - * Calls fopen on the specified file, giving debug error message on - * failure. Returns the file descriptor in all cases. + * Truncates a string at the first '\r' or '\n' **********************************************************************/ -FILE* check_for_file(char* path) +void chomp(char *string) { - FILE* fd; - if(!(fd = fopen(path, "r"))) - { - debug("Couldn't open '%s'\n",path); - } - return fd; + string[strcspn(string, "\r\n")] = '\0'; } + /*********************************************************************** * Fetches first number (ie the 35 of "35 123") from a * string -- cgit v1.1