Changeset: e474892af9be for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e474892af9be
Modified Files:
buildtools/Mx/MxFcnDef.h
clients/mapiclient/mclient.c
clients/mapiclient/msqldump.c
gdk/gdk_system.h
monetdb5/modules/mal/tablet_sql.mx
testing/Mtimeout.c
testing/helpers.h
tools/merovingian/client/monetdb.c
tools/mserver/mserver5.c
Branch: Aug2011
Log Message:
Added noreturn annotations.
diffs (118 lines):
diff --git a/buildtools/Mx/MxFcnDef.h b/buildtools/Mx/MxFcnDef.h
--- a/buildtools/Mx/MxFcnDef.h
+++ b/buildtools/Mx/MxFcnDef.h
@@ -150,7 +150,7 @@
extern void ofile_printf(_In_z_ _Printf_format_string_ const char *, ...)
__attribute__((__format__(__printf__, 1, 2)));
extern void Fatal(const char *, _In_z_ _Printf_format_string_ const char *,
...)
- __attribute__((__format__(__printf__, 2, 3)));
+ __attribute__((__format__(__printf__, 2, 3), __noreturn__));
extern void Error(_In_z_ _Printf_format_string_ const char *, ...)
__attribute__((__format__(__printf__, 1, 2)));
extern void Message(_In_z_ _Printf_format_string_ const char *, ...)
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -2350,6 +2350,9 @@
return errseen;
}
+static void usage(const char *prog, int xit)
+ __attribute__((__noreturn__));
+
static void
usage(const char *prog, int xit)
{
diff --git a/clients/mapiclient/msqldump.c b/clients/mapiclient/msqldump.c
--- a/clients/mapiclient/msqldump.c
+++ b/clients/mapiclient/msqldump.c
@@ -50,6 +50,9 @@
#include "msqldump.h"
#include "mprompt.h"
+static void usage(const char *prog, int xit)
+ __attribute__((__noreturn__));
+
static void
usage(const char *prog, int xit)
{
diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h
--- a/gdk/gdk_system.h
+++ b/gdk/gdk_system.h
@@ -108,8 +108,10 @@
enum MT_thr_detach { MT_THR_JOINABLE, MT_THR_DETACHED };
gdk_export int MT_create_thread(MT_Id *t, void (*function) (void *), void
*arg, enum MT_thr_detach d);
-gdk_export void MT_exit_thread(int status);
-gdk_export void MT_global_exit(int status);
+gdk_export void MT_exit_thread(int status)
+ __attribute__((__noreturn__));
+gdk_export void MT_global_exit(int status)
+ __attribute__((__noreturn__));
gdk_export MT_Id MT_getpid(void);
gdk_export int MT_join_thread(MT_Id t);
gdk_export int MT_kill_thread(MT_Id t);
diff --git a/monetdb5/modules/mal/tablet_sql.mx
b/monetdb5/modules/mal/tablet_sql.mx
--- a/monetdb5/modules/mal/tablet_sql.mx
+++ b/monetdb5/modules/mal/tablet_sql.mx
@@ -431,6 +431,8 @@
Reading is handled by a separate task as a preparation for
mode parallelism
@c
+static void SQLloader(void *p)
+ __attribute__((__noreturn__));
static void
SQLloader(void *p){
READERtask *task = (READERtask *)p;
diff --git a/testing/Mtimeout.c b/testing/Mtimeout.c
--- a/testing/Mtimeout.c
+++ b/testing/Mtimeout.c
@@ -154,6 +154,9 @@
}
+static void usage(void)
+ __attribute__((__noreturn__));
+
static void
usage(void)
{
diff --git a/testing/helpers.h b/testing/helpers.h
--- a/testing/helpers.h
+++ b/testing/helpers.h
@@ -25,7 +25,8 @@
#define MAX(a,b) (((a)>(b))?(a):(b))
#define MIN(a,b) (((a)<(b))?(a):(b))
-void ErrXit(char *text1, char *text2, int num);
+void ErrXit(char *text1, char *text2, int num)
+ __attribute__((__noreturn__));
FILE *Rfopen(char *name);
FILE *Wfopen(char *name);
FILE *Afopen(char *name);
diff --git a/tools/merovingian/client/monetdb.c
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -976,6 +976,9 @@
INHERIT
} meroset;
+static void command_set(int argc, char *argv[], meroset type)
+ __attribute__((__noreturn__));
+
static void
command_set(int argc, char *argv[], meroset type)
{
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -74,6 +74,9 @@
}
#endif
+static void usage(char *prog)
+ __attribute__((__noreturn__));
+
static void
usage(char *prog)
{
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
