From d51007358600010933f05109c9e203e87ea06c47 Mon Sep 17 00:00:00 2001 From: crunchy Date: Wed, 23 Apr 2003 09:06:31 +0000 Subject: restructuring part 4 --- libmpio/Makefile.am | 2 +- libmpio/debug.c | 313 ---------------------------------------------------- libmpio/src/debug.c | 313 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 314 insertions(+), 314 deletions(-) delete mode 100644 libmpio/debug.c create mode 100644 libmpio/src/debug.c diff --git a/libmpio/Makefile.am b/libmpio/Makefile.am index 2adfa19..0f33f3a 100644 --- a/libmpio/Makefile.am +++ b/libmpio/Makefile.am @@ -23,8 +23,8 @@ pkginclude_HEADERS= \ defs.h noinst_HEADERS= \ + debug.h \ src/io.h \ - src/debug.h \ src/smartmedia.h \ src/directory.h \ src/fat.h \ diff --git a/libmpio/debug.c b/libmpio/debug.c deleted file mode 100644 index f4eed65..0000000 --- a/libmpio/debug.c +++ /dev/null @@ -1,313 +0,0 @@ -/* - * debug.c - * - * Authors: Dirk Meyer - * Andreas Büsching - * - * $Id: debug.c,v 1.5 2003/04/23 09:03:37 crunchy Exp $ - */ - -#include "debug.h" - -#include -#include -#include -#include -#include - -#define DCOLOR "_color" -#define DFILE "_file" -#define DSUFFIX "_debug" -#define LEVEL_HEXDUMP 5 - -#define CHECK_FD if (__debug_fd == NULL) return; - -char *__debug_color = NULL; -int __debug_level = 0; -FILE *__debug_fd = NULL; - -void -debug_init(void) { - char *env_var = malloc(strlen(DPACKAGE) + strlen(DFILE) + 1); - const char *env; - - /* check debug output file */ - strcpy(env_var, DPACKAGE); - strcat(env_var, DFILE); - - if ((env = getenv(env_var))) { - if (__debug_fd && fileno(__debug_fd) != -1) { - fclose(__debug_fd); - } - - __debug_fd = fopen(env, "a"); - if (!__debug_fd) { - __debug_fd = stderr; - } - } else { - __debug_fd = stderr; - } - - free(env_var); - - /* check debug level */ - env_var = malloc(strlen(DPACKAGE) + strlen(DSUFFIX) + 1); - strcpy(env_var, DPACKAGE); - strcat(env_var, DSUFFIX); - - if ((env = getenv(env_var))) - if (isdigit(env[0])) - __debug_level = strtol(env, NULL, 10); - else - __debug_level = 1; - else - __debug_level = -1; - - free(env_var); - - /* check debug color */ - env_var = malloc(strlen(DPACKAGE) + strlen(DCOLOR) + 1); - - strcpy(env_var, DPACKAGE); - strcat(env_var, DCOLOR); - - if (__debug_color) free(__debug_color); - __debug_color = NULL; - - if ((env = getenv(env_var))) { - if (env[0] != '\0') { - __debug_color = malloc(4 + strlen(env)); - sprintf(__debug_color, "\033[%sm", env); - } else - __debug_color = malloc(6); - strcpy(__debug_color, "\033[32m"); - } else { - __debug_color = NULL; - } - - free(env_var); -} - -int -debug_file(char *filename) -{ - if (__debug_fd && fileno(__debug_fd) != -1) { - fclose(__debug_fd); - } - - __debug_fd = fopen(filename, "a"); - if (!__debug_fd) { - perror("fopen:"); - __debug_fd = stderr; - return 0; - } - - return 1; -} - -int -debug_level(int level) -{ - int tmp = __debug_level; - - __debug_level = level; - - return tmp; -} - -int -debug_level_get(void) -{ - return __debug_level; -} - - -void -_hexdump (const char *package, const char* file, int line, - const char* function, const char* data, int len) -{ - char buf[17]; - int i; - - CHECK_FD; - - if (_use_debug(LEVEL_HEXDUMP)) { - fprintf (__debug_fd, "%s%s:\033[m %s(%d): %s: data=%p len=%d\n", - __debug_color, package, file, line, function, data, len); - for (i = 0; data != NULL && i < len; i++) { - if (i % 16 == 0) - fprintf(__debug_fd, "\033[30m%s:\033[m %04x: ", package, i); - fprintf(__debug_fd, "%02x ", (unsigned int)(unsigned char)data[i]); - buf[i % 16] = (data[i] >= 32 && data[i] <= 126) ? data[i] : '.'; - buf[i % 16 + 1] = '\0'; - if (i % 4 == 3) fprintf(__debug_fd, " "); - if (i % 16 == 15) fprintf(__debug_fd, "%s\n", buf); - } - if (i % 16 != 0) { - for (; i % 16 != 0; i++) - fprintf (__debug_fd, (i % 4 == 3) ? " " : " "); - fprintf(__debug_fd, "%s\n", buf); - } - } -} - -void -_hexdump_n (const char *package, const int n, const char* file, int line, - const char* function, const char* data, int len) -{ - char buf[17]; - int i; - - CHECK_FD; - - if (_use_debug(n)) { - fprintf (__debug_fd, "%s%s:\033[m %s(%d): %s: data=%p len=%d\n", - __debug_color, package, file, line, function, data, len); - for (i = 0; data != NULL && i < len; i++) { - if (i % 16 == 0) - fprintf(__debug_fd, "\033[30m%s:\033[m %04x: ", package, i); - fprintf(__debug_fd, "%02x ", (unsigned int)(unsigned char)data[i]); - buf[i % 16] = (data[i] >= 32 && data[i] <= 126) ? data[i] : '.'; - buf[i % 16 + 1] = '\0'; - if (i % 4 == 3) fprintf(__debug_fd, " "); - if (i % 16 == 15) fprintf(__debug_fd, "%s\n", buf); - } - if (i % 16 != 0) { - for (; i % 16 != 0; i++) - fprintf (__debug_fd, (i % 4 == 3) ? " " : " "); - fprintf(__debug_fd, "%s\n", buf); - } - } -} - - -void -_hexdump_text (const char *text, - const char *package, const char *file, int line, - const char *function, const char *data, int len) -{ - CHECK_FD; - - if (_use_debug(LEVEL_HEXDUMP)) { - fprintf(__debug_fd, "%s%s: %s(%d): %s: %s\033[m", __debug_color, - package, file, line, function, text); - _hexdump(package, file, line, function, data, len); - } -} - - - -void -_error(const char *package, const char *file, int line, - const char *function, int fatal, const char *format, ...) -{ - char foo[2048]; - va_list ap; - - CHECK_FD; - - va_start(ap, format); - - - vsnprintf(foo, sizeof(foo) - strlen(format) - 1, format, ap); - if (_use_debug(0)) - fprintf(__debug_fd, "\033[31m%s: %s(%d): %s: %s\033[m", - package, file, line, function, foo); - else - fprintf(__debug_fd, "%s: %s(%d): %s: %s", - package, file, line, function, foo); - fflush(__debug_fd); - - if (fatal) { - fprintf(__debug_fd, "\033[31mfatal error -- exit programm\033[m\n"); - exit(1); - } - - va_end(ap); -} - -void -_debug(const char *package, const char *file, int line, - const char *function, const char *format, ...) -{ - char foo[2048]; - va_list ap; - va_start(ap, format); - - CHECK_FD; - - vsnprintf(foo, sizeof(foo) - strlen(format) - 1, format, ap); - - if (_use_debug(0)) { - fprintf(__debug_fd, "%s%s: %s(%d): %s: %s\033[m", - ( __debug_color ? __debug_color : ""), - package, file, line, function, foo); - fflush(__debug_fd); - } - - va_end(ap); -} - -void -_debug_n(const char *package, const int n, const char *file, - int line, const char *function, const char *format, ...) -{ - char foo[2048]; - va_list ap; - va_start(ap, format); - - CHECK_FD; - - vsnprintf(foo, sizeof(foo) - strlen(format) - 1, format, ap); - - if (_use_debug(n)) { - fprintf(__debug_fd, "%s%s: %s(%d): %s: %s\033[m", - ( __debug_color ? __debug_color : ""), - package, file, line, function, foo); - fflush(__debug_fd); - } - - va_end(ap); -} - -void -_octetstr(const char *package, const char *file, int line, - const char *function, const uint8_t *str, - const unsigned int len, const char *what) -{ - CHECK_FD; - - if (_use_debug(LEVEL_HEXDUMP)) { - unsigned int i; - - fprintf(__debug_fd, "%s%s: %s(%d): %s: ", - package, file, function, line, (what?what:"")); - for (i = 0; i < len; i++) { - if (i < (len - 1)) - fprintf(__debug_fd, "%03d.", str [i]); - else - fprintf(__debug_fd, "%03d", str [i]); - } - } -} - -int -_use_debug(int level) -{ - if (__debug_level == -1) return 0; - - CHECK_FD; - - if (level <= __debug_level) { - return 1; - } - - return 0; -} - -/* end of debug.c */ - - - - - diff --git a/libmpio/src/debug.c b/libmpio/src/debug.c new file mode 100644 index 0000000..a1d7240 --- /dev/null +++ b/libmpio/src/debug.c @@ -0,0 +1,313 @@ +/* + * debug.c + * + * Authors: Dirk Meyer + * Andreas Büsching + * + * $Id: debug.c,v 1.3 2003/04/23 09:06:33 crunchy Exp $ + */ + +#include "debug.h" + +#include +#include +#include +#include +#include + +#define DCOLOR "_color" +#define DFILE "_file" +#define DSUFFIX "_debug" +#define LEVEL_HEXDUMP 5 + +#define CHECK_FD if (__debug_fd == NULL) return; + +char *__debug_color = NULL; +int __debug_level = 0; +FILE *__debug_fd = NULL; + +void +debug_init(void) { + char *env_var = malloc(strlen(DPACKAGE) + strlen(DFILE) + 1); + const char *env; + + /* check debug output file */ + strcpy(env_var, DPACKAGE); + strcat(env_var, DFILE); + + if ((env = getenv(env_var))) { + if (__debug_fd && fileno(__debug_fd) != -1) { + fclose(__debug_fd); + } + + __debug_fd = fopen(env, "a"); + if (!__debug_fd) { + __debug_fd = stderr; + } + } else { + __debug_fd = stderr; + } + + free(env_var); + + /* check debug level */ + env_var = malloc(strlen(DPACKAGE) + strlen(DSUFFIX) + 1); + strcpy(env_var, DPACKAGE); + strcat(env_var, DSUFFIX); + + if ((env = getenv(env_var))) + if (isdigit(env[0])) + __debug_level = strtol(env, NULL, 10); + else + __debug_level = 1; + else + __debug_level = -1; + + free(env_var); + + /* check debug color */ + env_var = malloc(strlen(DPACKAGE) + strlen(DCOLOR) + 1); + + strcpy(env_var, DPACKAGE); + strcat(env_var, DCOLOR); + + if (__debug_color) free(__debug_color); + __debug_color = NULL; + + if ((env = getenv(env_var))) { + if (env[0] != '\0') { + __debug_color = malloc(4 + strlen(env)); + sprintf(__debug_color, "\033[%sm", env); + } else + __debug_color = malloc(6); + strcpy(__debug_color, "\033[32m"); + } else { + __debug_color = NULL; + } + + free(env_var); +} + +int +debug_file(char *filename) +{ + if (__debug_fd && fileno(__debug_fd) != -1) { + fclose(__debug_fd); + } + + __debug_fd = fopen(filename, "a"); + if (!__debug_fd) { + perror("fopen:"); + __debug_fd = stderr; + return 0; + } + + return 1; +} + +int +debug_level(int level) +{ + int tmp = __debug_level; + + __debug_level = level; + + return tmp; +} + +int +debug_level_get(void) +{ + return __debug_level; +} + + +void +_hexdump (const char *package, const char* file, int line, + const char* function, const char* data, int len) +{ + char buf[17]; + int i; + + CHECK_FD; + + if (_use_debug(LEVEL_HEXDUMP)) { + fprintf (__debug_fd, "%s%s:\033[m %s(%d): %s: data=%p len=%d\n", + __debug_color, package, file, line, function, data, len); + for (i = 0; data != NULL && i < len; i++) { + if (i % 16 == 0) + fprintf(__debug_fd, "\033[30m%s:\033[m %04x: ", package, i); + fprintf(__debug_fd, "%02x ", (unsigned int)(unsigned char)data[i]); + buf[i % 16] = (data[i] >= 32 && data[i] <= 126) ? data[i] : '.'; + buf[i % 16 + 1] = '\0'; + if (i % 4 == 3) fprintf(__debug_fd, " "); + if (i % 16 == 15) fprintf(__debug_fd, "%s\n", buf); + } + if (i % 16 != 0) { + for (; i % 16 != 0; i++) + fprintf (__debug_fd, (i % 4 == 3) ? " " : " "); + fprintf(__debug_fd, "%s\n", buf); + } + } +} + +void +_hexdump_n (const char *package, const int n, const char* file, int line, + const char* function, const char* data, int len) +{ + char buf[17]; + int i; + + CHECK_FD; + + if (_use_debug(n)) { + fprintf (__debug_fd, "%s%s:\033[m %s(%d): %s: data=%p len=%d\n", + __debug_color, package, file, line, function, data, len); + for (i = 0; data != NULL && i < len; i++) { + if (i % 16 == 0) + fprintf(__debug_fd, "\033[30m%s:\033[m %04x: ", package, i); + fprintf(__debug_fd, "%02x ", (unsigned int)(unsigned char)data[i]); + buf[i % 16] = (data[i] >= 32 && data[i] <= 126) ? data[i] : '.'; + buf[i % 16 + 1] = '\0'; + if (i % 4 == 3) fprintf(__debug_fd, " "); + if (i % 16 == 15) fprintf(__debug_fd, "%s\n", buf); + } + if (i % 16 != 0) { + for (; i % 16 != 0; i++) + fprintf (__debug_fd, (i % 4 == 3) ? " " : " "); + fprintf(__debug_fd, "%s\n", buf); + } + } +} + + +void +_hexdump_text (const char *text, + const char *package, const char *file, int line, + const char *function, const char *data, int len) +{ + CHECK_FD; + + if (_use_debug(LEVEL_HEXDUMP)) { + fprintf(__debug_fd, "%s%s: %s(%d): %s: %s\033[m", __debug_color, + package, file, line, function, text); + _hexdump(package, file, line, function, data, len); + } +} + + + +void +_error(const char *package, const char *file, int line, + const char *function, int fatal, const char *format, ...) +{ + char foo[2048]; + va_list ap; + + CHECK_FD; + + va_start(ap, format); + + + vsnprintf(foo, sizeof(foo) - strlen(format) - 1, format, ap); + if (_use_debug(0)) + fprintf(__debug_fd, "\033[31m%s: %s(%d): %s: %s\033[m", + package, file, line, function, foo); + else + fprintf(__debug_fd, "%s: %s(%d): %s: %s", + package, file, line, function, foo); + fflush(__debug_fd); + + if (fatal) { + fprintf(__debug_fd, "\033[31mfatal error -- exit programm\033[m\n"); + exit(1); + } + + va_end(ap); +} + +void +_debug(const char *package, const char *file, int line, + const char *function, const char *format, ...) +{ + char foo[2048]; + va_list ap; + va_start(ap, format); + + CHECK_FD; + + vsnprintf(foo, sizeof(foo) - strlen(format) - 1, format, ap); + + if (_use_debug(0)) { + fprintf(__debug_fd, "%s%s: %s(%d): %s: %s\033[m", + ( __debug_color ? __debug_color : ""), + package, file, line, function, foo); + fflush(__debug_fd); + } + + va_end(ap); +} + +void +_debug_n(const char *package, const int n, const char *file, + int line, const char *function, const char *format, ...) +{ + char foo[2048]; + va_list ap; + va_start(ap, format); + + CHECK_FD; + + vsnprintf(foo, sizeof(foo) - strlen(format) - 1, format, ap); + + if (_use_debug(n)) { + fprintf(__debug_fd, "%s%s: %s(%d): %s: %s\033[m", + ( __debug_color ? __debug_color : ""), + package, file, line, function, foo); + fflush(__debug_fd); + } + + va_end(ap); +} + +void +_octetstr(const char *package, const char *file, int line, + const char *function, const uint8_t *str, + const unsigned int len, const char *what) +{ + CHECK_FD; + + if (_use_debug(LEVEL_HEXDUMP)) { + unsigned int i; + + fprintf(__debug_fd, "%s%s: %s(%d): %s: ", + package, file, function, line, (what?what:"")); + for (i = 0; i < len; i++) { + if (i < (len - 1)) + fprintf(__debug_fd, "%03d.", str [i]); + else + fprintf(__debug_fd, "%03d", str [i]); + } + } +} + +int +_use_debug(int level) +{ + if (__debug_level == -1) return 0; + + CHECK_FD; + + if (level <= __debug_level) { + return 1; + } + + return 0; +} + +/* end of debug.c */ + + + + + -- cgit v1.2.3