From e9d5a231292e7124e19369e4af6597b948c4f24d Mon Sep 17 00:00:00 2001 From: Martin Lund Date: Fri, 11 Mar 2022 13:33:35 +0100 Subject: [PATCH] Move string_to_long() to misc.c --- src/misc.c | 17 +++++++++++++++++ src/misc.h | 1 + src/options.c | 17 +---------------- src/options.h | 1 - 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/misc.c b/src/misc.c index 1a40a0c..d865787 100644 --- a/src/misc.c +++ b/src/misc.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "error.h" #include "print.h" #include "options.h" @@ -91,3 +92,19 @@ void delay(long ms) nanosleep(&ts, NULL); } + +long string_to_long(char *string) +{ + long result; + char *end_token; + + errno = 0; + result = strtol(string, &end_token, 10); + if ((errno != 0) || (*end_token != 0)) + { + printf("Error: Invalid digit\n"); + exit(EXIT_FAILURE); + } + + return result; +} diff --git a/src/misc.h b/src/misc.h index 9c7c013..a89ee7c 100644 --- a/src/misc.h +++ b/src/misc.h @@ -24,3 +24,4 @@ char * current_time(void); void delay(long ms); +long string_to_long(char *string); diff --git a/src/options.c b/src/options.c index b881e2d..fad7504 100644 --- a/src/options.c +++ b/src/options.c @@ -32,6 +32,7 @@ #include #include "options.h" #include "error.h" +#include "misc.h" /* Default options */ struct option_t option = @@ -80,22 +81,6 @@ void print_help(char *argv[]) printf("\n"); } -long string_to_long(char *string) -{ - long result; - char *end_token; - - errno = 0; - result = strtol(string, &end_token, 10); - if ((errno != 0) || (*end_token != 0)) - { - printf("Error: Invalid digit\n"); - exit(EXIT_FAILURE); - } - - return result; -} - void parse_options(int argc, char *argv[]) { int c; diff --git a/src/options.h b/src/options.h index bf8fbd0..b03e9f0 100644 --- a/src/options.h +++ b/src/options.h @@ -56,5 +56,4 @@ struct option_t extern struct option_t option; -long string_to_long(char *string); void parse_options(int argc, char *argv[]);