Changeset: e83829e39712 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e83829e39712
Modified Files:
clients/Tests/exports.stable.out
testing/listexports.py.in
Branch: Dec2011
Log Message:
Prettify output.
diffs (98 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -172,9 +172,9 @@ int GDKcreatedir(const char *nme);
int GDKdebug;
int GDKembedded;
BAT *GDKenv;
-int GDKerror(_In_z_ _Printf_format_string_ const char *format,
...)__attribute__((__format__(__printf__, 1, 2)));
+int GDKerror(_In_z_ _Printf_format_string_ const char *format, ...)
__attribute__((__format__(__printf__, 1, 2)));
void GDKexit(int status);
-int GDKfatal(_In_z_ _Printf_format_string_ const char *format,
...)__attribute__((__format__(__printf__, 1, 2)));
+int GDKfatal(_In_z_ _Printf_format_string_ const char *format, ...)
__attribute__((__format__(__printf__, 1, 2)));
void GDKfilepath(str path, const char *nme, const char *mode, const char *ext);
void GDKfree(void *blk);
char *GDKgetenv(const char *name);
@@ -201,7 +201,7 @@ int GDKremovedir(const char *nme);
void GDKsetenv(str name, str value);
ssize_t GDKstrFromStr(unsigned char *src, unsigned char *dst, ssize_t len);
str GDKstrdup(const char *s);
-int GDKsyserror(_In_z_ _Printf_format_string_ const char *format,
...)__attribute__((__format__(__printf__, 1, 2)));
+int GDKsyserror(_In_z_ _Printf_format_string_ const char *format, ...)
__attribute__((__format__(__printf__, 1, 2)));
ThreadRec GDKthreads[THREADS];
int GDKupgradevarheap(COLrec *c, var_t v, int copyall);
lng GDKusec(void);
@@ -226,10 +226,10 @@ size_t HEAPvmsize(Heap *h);
int MT_check_nr_cores(void);
unsigned long long MT_clock();
int MT_create_thread(MT_Id *t, void( *function)(void *), void *arg, enum
MT_thr_detach d);
-void MT_exit_thread(int status)__attribute__((__noreturn__));
+void MT_exit_thread(int status) __attribute__((__noreturn__));
MT_Id MT_getpid(void);
size_t MT_getrss(void);
-void MT_global_exit(int status)__attribute__((__noreturn__));
+void MT_global_exit(int status) __attribute__((__noreturn__));
char *MT_heapbase;
char *MT_heapcur(void);
void MT_init(void);
@@ -291,7 +291,7 @@ void *THRgetdata(int);
int THRgettid(void);
int THRhighwater(void);
Thread THRnew(MT_Id pid, str name);
-int THRprintf(stream *s, _In_z_ _Printf_format_string_ const char *format,
...)__attribute__((__format__(__printf__, 2, 3)));
+int THRprintf(stream *s, _In_z_ _Printf_format_string_ const char *format,
...) __attribute__((__format__(__printf__, 2, 3)));
void THRsetdata(int, ptr);
int TMabort(void);
int TMcommit(void);
@@ -5709,9 +5709,9 @@ str copy_fromRef;
str countRef;
str count_no_nilRef;
int cpyConstant(MalBlkPtr mb, VarPtr vr);
-str createException(enum malexception, const char *, _In_z_
_Printf_format_string_ const char *, ...)__attribute__((__format__(__printf__,
3, 4)));
+str createException(enum malexception, const char *, _In_z_
_Printf_format_string_ const char *, ...) __attribute__((__format__(__printf__,
3, 4)));
str createRef;
-str createScriptException(MalBlkPtr, int, enum malexception, const char *,
_In_z_ _Printf_format_string_ const char *,
...)__attribute__((__format__(__printf__, 5, 6)));
+str createScriptException(MalBlkPtr, int, enum malexception, const char *,
_In_z_ _Printf_format_string_ const char *, ...)
__attribute__((__format__(__printf__, 5, 6)));
str crossRef;
int cstToken(Client cntxt, ValPtr val);
str datacellRef;
@@ -6277,7 +6277,7 @@ void showAllScenarios(stream *f);
void showAtoms(stream *fd);
void showCurrentScenario(void);
void showErrors(Client cntxt);
-void showException(enum malexception, const char *, _In_z_
_Printf_format_string_ const char *, ...)__attribute__((__format__(__printf__,
3, 4)));
+void showException(enum malexception, const char *, _In_z_
_Printf_format_string_ const char *, ...) __attribute__((__format__(__printf__,
3, 4)));
void showFlowGraph(MalBlkPtr mb, MalStkPtr stk, str fname);
void showHelp(Module m, str txt,stream *fs);
void showMalBlkHistory(MalBlkPtr mb);
@@ -6287,7 +6287,7 @@ void showOptimizerHistory(void);
void showOptimizerStep(str fnme,int i, int flg);
void showScenario(stream *f, Scenario s);
void showScenarioByName(stream *f, str s);
-void showScriptException(MalBlkPtr, int, enum malexception, _In_z_
_Printf_format_string_ const char *, ...)__attribute__((__format__(__printf__,
4, 5)));
+void showScriptException(MalBlkPtr, int, enum malexception, _In_z_
_Printf_format_string_ const char *, ...) __attribute__((__format__(__printf__,
4, 5)));
str shtFromintImpl(sht *res, int *val);
str shtFromlngImpl(sht *res, lng *val);
str shutdownFactory(Client cntxt, MalBlkPtr mb);
@@ -6436,7 +6436,7 @@ int mnstr_fsync(stream *s);
buffer *mnstr_get_buffer(stream *s);
int mnstr_init(void);
char *mnstr_name(stream *s);
-int mnstr_printf(stream *s, _In_z_ _Printf_format_string_ const char *format,
...)__attribute__((__format__(__printf__, 2, 3)));
+int mnstr_printf(stream *s, _In_z_ _Printf_format_string_ const char *format,
...) __attribute__((__format__(__printf__, 2, 3)));
ssize_t mnstr_read(stream *s, void *buf, size_t elmsize, size_t cnt);
int mnstr_readBte(stream *s, signed char *val);
int mnstr_readBteArray(stream *s, signed char *val, size_t cnt);
diff --git a/testing/listexports.py.in b/testing/listexports.py.in
--- a/testing/listexports.py.in
+++ b/testing/listexports.py.in
@@ -40,7 +40,8 @@ def extract(f):
.replace(' )', ')') \
.replace(') ', ')') \
.replace('* ', '*') \
- .replace(' ,', ',')
+ .replace(' ,', ',') \
+ .replace(')__attribute__', ') __attribute__')
decl = strre.sub(r'\1 *', decl)
res = nmere.search(decl)
if res is not None:
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
