diff --git a/hhss/c/rtdbparse.c b/hhss/c/rtdbparse.c index 75e93cd..8da4aa7 100644 --- a/hhss/c/rtdbparse.c +++ b/hhss/c/rtdbparse.c @@ -1,10 +1,6 @@ #include "rtdbparse.h" #include "rtdbparse.internals.h" -#include - -static jmp_buf env; - extern array_t *rtdbparse(array_t *linestr) { array_t *table, *sectarr; char *sectname; diff --git a/hhss/c/rtdbparse.internals.h b/hhss/c/rtdbparse.internals.h index b77157a..db4a4aa 100644 --- a/hhss/c/rtdbparse.internals.h +++ b/hhss/c/rtdbparse.internals.h @@ -5,6 +5,7 @@ * INCLUDES * ************/ #include +#include #include #include # @@ -41,6 +42,8 @@ static void synerr(void); ********************/ static const char *whitespaces = " \a\b\t\n\v\f\r"; +static jmp_buf env; + static array_t *ls; static line_t *l; static size_t idx, len; diff --git a/lib/readline.c b/lib/readline.c index de6511c..4c11016 100644 --- a/lib/readline.c +++ b/lib/readline.c @@ -1,8 +1,6 @@ #include "readline.h" #include "readline.internals.h" -static const char *errmsg = "unable to read"; - extern int readln(FILE *fp, char **line, size_t *len) { int ch; size_t pos, bufsiz; diff --git a/lib/readline.internals.h b/lib/readline.internals.h index 0fce73e..c01a763 100644 --- a/lib/readline.internals.h +++ b/lib/readline.internals.h @@ -12,4 +12,9 @@ **********/ #define READLINE_UNIT 64 +/******************** + * STATIC VARIABLES * + ********************/ +static const char *errmsg = "unable to read"; + #endif diff --git a/lib/wrappers.c b/lib/wrappers.c index 0fcf9bc..8c2b657 100644 --- a/lib/wrappers.c +++ b/lib/wrappers.c @@ -23,8 +23,6 @@ extern void safe_fputs(FILE *stream, const char *line) { /************ * stdlib.h * ************/ -static const char *realloc_errmsg = "realloc error"; - extern void *safe_malloc(size_t siz) { void *ret = malloc(siz); if (!ret) ERR("malloc error"); @@ -66,8 +64,6 @@ extern void *safe_realloc2x_arr(void *orig_arr, size_t *cnt, size_t esiz) { /************ * stdarg.h * ************/ -static const char *vfprintf_errmsg = "vfprintf error"; - extern void safe_fprintf(FILE *stream, const char *format, ...) { va_list ap; int ret; diff --git a/lib/wrappers.internals.h b/lib/wrappers.internals.h index 0ca74fb..7550d0a 100644 --- a/lib/wrappers.internals.h +++ b/lib/wrappers.internals.h @@ -9,4 +9,10 @@ # #include "fatal.h" +/******************** + * STATIC VARIABLES * + ********************/ +static const char *realloc_errmsg = "realloc error"; +static const char *vfprintf_errmsg = "vfprintf error"; + #endif