Changeset: 7a7327384e11 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7a7327384e11
Modified Files:
clients/Tests/exports.stable.out
testing/exportutils.py
Branch: client-filetrans
Log Message:
Improve normalization of pointers to functions.
diffs (48 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
@@ -289,7 +289,7 @@ size_t HEAPvmsize(Heap *h);
void IMPSdestroy(BAT *b);
lng IMPSimprintsize(BAT *b);
int MT_check_nr_cores(void);
-int MT_create_thread(MT_Id *t, void( *function)(void *), void *arg, enum
MT_thr_detach d);
+int MT_create_thread(MT_Id *t, void (*function)(void *), void *arg, enum
MT_thr_detach d);
void MT_exiting_thread(void);
MT_Id MT_getpid(void);
size_t MT_getrss(void);
@@ -559,7 +559,7 @@ MapiMsg mapi_seek_row(MapiHdl hdl, int64
MapiHdl mapi_send(Mapi mid, const char *cmd);
MapiMsg mapi_setAutocommit(Mapi mid, bool autocommit);
MapiMsg mapi_set_size_header(Mapi mid, int value);
-void mapi_setfilecallback(Mapi mid, char *( *getfunc)(void *priv, const char
*filename, bool binary, uint64_t offset, size_t *size), char *( *putfunc)(void
*priv, const char *filename, const void *restrict data, size_t size), void
*priv);
+void mapi_setfilecallback(Mapi mid, char *(*getfunc)(void *priv, const char
*filename, bool binary, uint64_t offset, size_t *size), char *(*putfunc)(void
*priv, const char *filename, const void *restrict data, size_t size), void
*priv);
int mapi_split_line(MapiHdl hdl);
MapiMsg mapi_start_talking(Mapi mid);
MapiMsg mapi_store_field(MapiHdl hdl, int fnr, int outtype, void *outparam);
@@ -2716,7 +2716,7 @@ char *buffer_get_buf(buffer *b);
void buffer_init(buffer *restrict b, char *restrict buf, size_t size);
stream *buffer_rastream(buffer *restrict b, const char *restrict name);
stream *buffer_wastream(buffer *restrict b, const char *restrict name);
-stream *callback_stream(void *restrict priv, ssize_t( *read)(void *restrict
priv, void *restrict buf, size_t elmsize, size_t cnt), void( *close)(void
*priv), void( *destroy)(void *priv), const char *restrict name);
+stream *callback_stream(void *restrict priv, ssize_t (*read)(void *restrict
priv, void *restrict buf, size_t elmsize, size_t cnt), void (*close)(void
*priv), void (*destroy)(void *priv), const char *restrict name);
void close_stream(stream *s);
stream *file_rastream(FILE *restrict fp, const char *restrict name);
stream *file_rstream(FILE *restrict fp, const char *restrict name);
@@ -2760,7 +2760,7 @@ int mnstr_readStr(stream *restrict s, ch
ssize_t mnstr_read_block(stream *restrict s, void *restrict buf, size_t
elmsize, size_t cnt);
ssize_t mnstr_readline(stream *restrict s, void *restrict buf, size_t maxcnt);
void mnstr_set_bigendian(stream *s, bool bigendian);
-void mnstr_settimeout(stream *s, unsigned int ms, bool( *func)(void));
+void mnstr_settimeout(stream *s, unsigned int ms, bool (*func)(void));
ssize_t mnstr_write(stream *restrict s, const void *restrict buf, size_t
elmsize, size_t cnt);
int mnstr_writeBte(stream *s, int8_t val);
int mnstr_writeBteArray(stream *restrict s, const int8_t *restrict val, size_t
cnt);
diff --git a/testing/exportutils.py b/testing/exportutils.py
--- a/testing/exportutils.py
+++ b/testing/exportutils.py
@@ -122,4 +122,5 @@ def normalize(decl):
.replace(')__attribute__', ') __attribute__')
decl = strre.sub(r'\1 *', decl)
decl = comre.sub(', ', decl)
+ decl = decl.replace('( *', ' (*').replace('* (*', '*(*')
return decl
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
