Changeset: 8dd20e74fad7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8dd20e74fad7
Modified Files:
buildtools/Mx/Sys.c
clients/mapiclient/Makefile.ag
gdk/gdk_utils.mx
testing/Mfilter.py.in
Branch: default
Log Message:
Merged from Apr2012
diffs (82 lines):
diff --git a/buildtools/Mx/Sys.c b/buildtools/Mx/Sys.c
--- a/buildtools/Mx/Sys.c
+++ b/buildtools/Mx/Sys.c
@@ -30,7 +30,6 @@
int mx_out = 1;
extern int somethingPrinted; /* used for preventing to empty display lines */
-/* VARARGS */
void
ofile_printf(const char *format, ...)
{
diff --git a/clients/mapiclient/Makefile.ag b/clients/mapiclient/Makefile.ag
--- a/clients/mapiclient/Makefile.ag
+++ b/clients/mapiclient/Makefile.ag
@@ -42,7 +42,7 @@ bin_stethoscope = {
SOURCES = stethoscope.c
LIBS = libmcutil ../mapilib/libmapi \
../../common/stream/libstream \
- $(curl_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS)
+ $(curl_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS) $(SOCKET_LIBS)
}
bin_mnc = {
diff --git a/gdk/gdk_utils.mx b/gdk/gdk_utils.mx
--- a/gdk/gdk_utils.mx
+++ b/gdk/gdk_utils.mx
@@ -223,7 +223,6 @@ static FILE *GDKlockFile = 0;
* Single-lined comments can now be logged safely, together with process,
thread
* and user ID, and the current time.
*/
-/* VARARGS */
void
GDKlog(const char *format, ...)
{
@@ -2056,7 +2055,7 @@ GDKaddbuf(const char *message)
#define GDKERRLEN (1024+512)
- /*VARARGS*/ int
+int
GDKerror(const char *format, ...)
{
char message[GDKERRLEN];
@@ -2077,7 +2076,7 @@ GDKerror(const char *format, ...)
return 0;
}
- /*VARARGS*/ int
+int
GDKsyserror(const char *format, ...)
{
char message[GDKERRLEN];
@@ -2145,7 +2144,7 @@ GDKclrerr(void)
}
/* coverity[+kill] */
- /*VARARGS*/ int
+int
GDKfatal(const char *format, ...)
{
char message[GDKERRLEN];
@@ -2369,7 +2368,7 @@ THRgettid(void)
static char THRprintbuf[BUFSIZ];
- /*VARARGS*/ int
+int
THRprintf(stream *s, const char *format, ...)
{
str bf = THRprintbuf, p = 0;
diff --git a/testing/Mfilter.py.in b/testing/Mfilter.py.in
--- a/testing/Mfilter.py.in
+++ b/testing/Mfilter.py.in
@@ -91,7 +91,7 @@ norm_in = re.compile('(?:'+')|(?:'.join
r"^(DBD::monetdb::db table_info warning: Catalog parameter '' ignored at
)([\./].+/|[A-Z]:\\.+[/\\])([^/\\]+\.pl line [0-9]+\.)\n", # 27: 3
r'^(ERROR REPORTED: DBD:|SyntaxException:parseError)(:.+ at
)([\./].+/|[A-Z]:\\.+[/\\])([^/\\]+\.pm line [0-9]+\.)\n',
# 28: 3
# filter for geos 3.3 vs. geos 3.2, can be removed if we have 3.3 everywhere
- r"^(ERROR = !MALException:wkb.FromText:ParseException: Expected )('EMPTY'
or '\(')( but encountered : '\)')\n", # 29: 3
+ r"^(ERROR = !ParseException: Expected )('EMPTY' or '\(')( but encountered
: '\)')\n", # 29: 3
])+')', re.MULTILINE)
norm_hint = '# the original non-normalized output was: '
norm_out = (
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
