From e1e5b5fd7fc277a355a90ae0840965afdba4b16a Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 19 Feb 2014 10:59:35 +0100 Subject: Add some more args and revert division by zero. --- main_complete.c | 4 ++-- main_simple.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/main_complete.c b/main_complete.c index a79dbc5..a649078 100644 --- a/main_complete.c +++ b/main_complete.c @@ -63,8 +63,8 @@ int main(int argc, char *argv[]) INFO(example, "We are up and running"); DEBUG(example, "Or are we %d?", 42); - int a = 0; - DEBUG(foo, "Or are we %d?", 1/a); + + DEBUG(foo, "Or are we %d?", 42); hug_close(); diff --git a/main_simple.c b/main_simple.c index 07b577d..60d57ac 100644 --- a/main_simple.c +++ b/main_simple.c @@ -57,9 +57,11 @@ int main(int argc, char *argv[]) INFO(example, "We are up and running"); - DEBUG(example, "Or are we %d?", 42); + DEBUG(example, "Or are we %d %s?", 42, "hello"); - DEBUG(foo, "Or are we %d?", 42); + const char bar[] = "bar"; + (void)bar; // Ignore if compiled with hugin disabled. + DEBUG(foo, "Or are we %d %s?", 42, bar); hug_close(); -- cgit v1.2.3 From 012caf41c488d18789621b77f0b7f01838edea3f Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 19 Feb 2014 11:00:38 +0100 Subject: Ignore -disabled targets. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index f412e30..aafaad5 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,7 @@ hugin-mutex hugin-obj hugin-simple hugin-syslog +hugin-complete-disabled +hugin-simple-disabled hugin.o main_simple.o -- cgit v1.2.3 From 5b2553a99de26d4f2910bd7e3edcfcef803440c8 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 19 Feb 2014 11:01:26 +0100 Subject: Re-introduce fix to va_arg list 64bit segfault. --- hugin.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hugin.c b/hugin.c index e755841..42369d8 100644 --- a/hugin.c +++ b/hugin.c @@ -407,13 +407,13 @@ int __debug(const char *func, const int line, // // Generate message // - va_list va; - va_start(va, fmt); { + va_list va; + va_start(va, fmt); hdr_bufsz = scprintf(hdr_fmt, HDR_ARGS); msg_bufsz = vscprintf(fmt, va); if(hdr_bufsz < 0 || msg_bufsz < 0) return 1; // Bad format? - // va_end(va); + va_end(va); } buf = (char*)malloc(hdr_bufsz + msg_bufsz + 1); @@ -423,8 +423,8 @@ int __debug(const char *func, const int line, if(sz < 0) return 1; // Unknown error { - //va_list va; - //va_start(va, fmt); + va_list va; + va_start(va, fmt); sz = vsprintf(buf + sz, fmt, va); if(sz < 0) return 1; // Unknown error va_end(va); -- cgit v1.2.3 From f8dc9ad4c41c7ec781c180d327f11ba78801263d Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 19 Feb 2014 11:04:30 +0100 Subject: Add debug output. --- main_complete.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/main_complete.c b/main_complete.c index a649078..b86e2a1 100644 --- a/main_complete.c +++ b/main_complete.c @@ -35,6 +35,8 @@ int main(int argc, char *argv[]) { + printf("Running...\n"); + int fd = open("/tmp/my.log", O_CREAT | O_RDWR, 0777); if(fd == -1) { return 1; @@ -68,5 +70,7 @@ int main(int argc, char *argv[]) hug_close(); + printf("done\n"); + return 0; } -- cgit v1.2.3 From 7f8952630abc0db42aa29cc0f2df4481789433bc Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 19 Feb 2014 11:11:49 +0100 Subject: Add error handling and unlink of created tmp files. --- main_complete.c | 13 ++++++++----- main_simple.c | 13 ++++++++++--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/main_complete.c b/main_complete.c index b86e2a1..8eb4b7e 100644 --- a/main_complete.c +++ b/main_complete.c @@ -30,15 +30,17 @@ #include #include #include - +#include #include +#include +#include int main(int argc, char *argv[]) { - printf("Running...\n"); - - int fd = open("/tmp/my.log", O_CREAT | O_RDWR, 0777); + const char *mylog = "/tmp/my.log"; + int fd = open(mylog, O_CREAT | O_RDWR, 0777); if(fd == -1) { + printf("Could not open '%s' for writing: %s", mylog, strerror(errno)); return 1; } hug_status_t status = hug_init(HUG_FLAG_USE_MUTEX | @@ -70,7 +72,8 @@ int main(int argc, char *argv[]) hug_close(); - printf("done\n"); + unlink(mylog); + unlink("/tmp/my.log2"); return 0; } diff --git a/main_simple.c b/main_simple.c index 60d57ac..84753c9 100644 --- a/main_simple.c +++ b/main_simple.c @@ -30,13 +30,17 @@ #include #include #include - +#include #include +#include +#include int main(int argc, char *argv[]) { - int fd = open("/tmp/my.log", O_CREAT | O_RDWR, 0777); + const char *mylog = "/tmp/my.log"; + int fd = open(mylog, O_CREAT | O_RDWR, 0777); if(fd == -1) { + printf("Could not open '%s' for writing: %s", mylog, strerror(errno)); return 1; } @@ -46,7 +50,7 @@ int main(int argc, char *argv[]) HUG_FLAG_OUTPUT_TO_STDERR | 0, HUG_OPTION_FD, fd, - HUG_OPTION_FILENAME, "/tmp/my2.log", + HUG_OPTION_FILENAME, "/tmp/my.log2", HUG_OPTION_STDOUT_NO_DATE, 0, HUG_OPTION_END); @@ -65,5 +69,8 @@ int main(int argc, char *argv[]) hug_close(); + unlink(mylog); + unlink("/tmp/my.log2"); + return 0; } -- cgit v1.2.3 From 2eade11fd95619362723f13d97be63e95e45584a Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 19 Feb 2014 11:13:11 +0100 Subject: Reintroduce 64bit va_arg crash for testing on build server. --- hugin.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/hugin.c b/hugin.c index 42369d8..bc232f4 100644 --- a/hugin.c +++ b/hugin.c @@ -407,13 +407,14 @@ int __debug(const char *func, const int line, // // Generate message // + va_list va; + va_start(va, fmt); + { - va_list va; - va_start(va, fmt); hdr_bufsz = scprintf(hdr_fmt, HDR_ARGS); msg_bufsz = vscprintf(fmt, va); if(hdr_bufsz < 0 || msg_bufsz < 0) return 1; // Bad format? - va_end(va); + //va_end(va); } buf = (char*)malloc(hdr_bufsz + msg_bufsz + 1); @@ -423,8 +424,8 @@ int __debug(const char *func, const int line, if(sz < 0) return 1; // Unknown error { - va_list va; - va_start(va, fmt); + // va_list va; + // va_start(va, fmt); sz = vsprintf(buf + sz, fmt, va); if(sz < 0) return 1; // Unknown error va_end(va); -- cgit v1.2.3 From 2675d6d8c4235730530339aa1625f386586cd6fc Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 19 Feb 2014 11:14:08 +0100 Subject: Re-introduce fix to va_arg list 64bit segfault. --- hugin.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hugin.c b/hugin.c index bc232f4..42369d8 100644 --- a/hugin.c +++ b/hugin.c @@ -407,14 +407,13 @@ int __debug(const char *func, const int line, // // Generate message // - va_list va; - va_start(va, fmt); - { + va_list va; + va_start(va, fmt); hdr_bufsz = scprintf(hdr_fmt, HDR_ARGS); msg_bufsz = vscprintf(fmt, va); if(hdr_bufsz < 0 || msg_bufsz < 0) return 1; // Bad format? - //va_end(va); + va_end(va); } buf = (char*)malloc(hdr_bufsz + msg_bufsz + 1); @@ -424,8 +423,8 @@ int __debug(const char *func, const int line, if(sz < 0) return 1; // Unknown error { - // va_list va; - // va_start(va, fmt); + va_list va; + va_start(va, fmt); sz = vsprintf(buf + sz, fmt, va); if(sz < 0) return 1; // Unknown error va_end(va); -- cgit v1.2.3 From 71f375f27e7a59115c0ddace258052f3147dd023 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 19 Feb 2014 11:16:38 +0100 Subject: Remove old comment about va_arg copying. --- hugin.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hugin.c b/hugin.c index 42369d8..c677ecd 100644 --- a/hugin.c +++ b/hugin.c @@ -44,10 +44,6 @@ # ifdef WIN32 # include typedef HANDLE mutex_t; - -// see http://stackoverflow.com/questions/558223/va-copy-porting-to-visual-c -//#define va_copy(dest, src) (dest = src) - # else # include typedef pthread_mutex_t mutex_t; -- cgit v1.2.3 From 9ade9fd834a59e505c4856a206851c8256d08abe Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 28 May 2014 14:32:40 +0200 Subject: Fix nameclash with gcc __debug symbol. --- hugin.c | 6 +++--- hugin.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hugin.c b/hugin.c index c677ecd..5b4591b 100644 --- a/hugin.c +++ b/hugin.c @@ -379,9 +379,9 @@ static int scprintf(const char *fmt, ...) #define HDR_ARGS debug_class_str[(unsigned)cl], ch, func, line -int __debug(const char *func, const int line, - const enum __debug_class cl, - const char *ch, const char *fmt, ...) +int __hugin__debug(const char *func, const int line, + const enum __debug_class cl, + const char *ch, const char *fmt, ...) { int result = 0; int sz; diff --git a/hugin.h b/hugin.h index 768cdcf..ee1152b 100644 --- a/hugin.h +++ b/hugin.h @@ -179,12 +179,12 @@ enum __debug_class __class_debug = 4 }; -int __debug(const char *func, const int line, enum __debug_class cl, - const char *ch, const char *fmt, ...) +int __hugin__debug(const char *func, const int line, enum __debug_class cl, + const char *ch, const char *fmt, ...) __attribute__((format (printf,5,6))); #define __DEBUG_PRINT(cl, ch, fmt...) \ - do { __debug(__func__, __LINE__, cl, ch, fmt); } while(0) + do { __hugin__debug(__func__, __LINE__, cl, ch, fmt); } while(0) #define __DEBUG(cl, ch, fmt...) \ __DEBUG_PRINT(__class##cl, #ch, fmt) -- cgit v1.2.3