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(-) (limited to 'hugin.c') 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 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(-) (limited to 'hugin.c') 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(-) (limited to 'hugin.c') 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(-) (limited to 'hugin.c') 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 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'hugin.c') 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; -- cgit v1.2.3