Changeset: 4bc2f492b25d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/4bc2f492b25d
Modified Files:
clients/Tests/exports.stable.out
clients/examples/C/streamcat.c
clients/mapiclient/mclient.c
clients/mapilib/mapi.c
common/stream/stream.c
common/stream/stream.h
gdk/gdk_utils.c
tools/merovingian/daemon/merovingian.c
Branch: default
Log Message:
Simplify signature mnstr_init.
diffs (107 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
@@ -1453,7 +1453,7 @@ int mnstr_fsetpos(stream *restrict s, fp
int mnstr_fsync(stream *s);
buffer *mnstr_get_buffer(stream *s);
bool mnstr_get_swapbytes(const stream *s);
-int mnstr_init(bool embedded);
+int mnstr_init(void);
int mnstr_isalive(const stream *s);
bool mnstr_isbinary(const stream *s);
char *mnstr_name(const stream *s);
diff --git a/clients/examples/C/streamcat.c b/clients/examples/C/streamcat.c
--- a/clients/examples/C/streamcat.c
+++ b/clients/examples/C/streamcat.c
@@ -92,7 +92,7 @@ croak(int status, const char *msg, ...)
int
main(int argc, char *argv[])
{
- if (mnstr_init(false) < 0)
+ if (mnstr_init() < 0)
croak(2, "Could not initialize streams library");
if (argc < 2)
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -3178,7 +3178,7 @@ main(int argc, char **argv)
perror("sigaction");
#endif
- if (mnstr_init(false) < 0) {
+ if (mnstr_init() < 0) {
fprintf(stderr, "error: could not initialize streams library");
exit(2);
}
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -2039,7 +2039,7 @@ mapi_mapiuri(const char *url, const char
char *query;
if (!ATOMIC_TAS(&mapi_initialized)) {
- if (mnstr_init(false) < 0)
+ if (mnstr_init() < 0)
return NULL;
}
@@ -2161,7 +2161,7 @@ mapi_mapi(const char *host, int port, co
Mapi mid;
if (!ATOMIC_TAS(&mapi_initialized)) {
- if (mnstr_init(false) < 0)
+ if (mnstr_init() < 0)
return NULL;
}
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -148,9 +148,8 @@ get_tl_error_buf(void)
static const char *mnstr_error_kind_description(mnstr_error_kind kind);
int
-mnstr_init(bool embedded)
+mnstr_init(void)
{
- (void) embedded;
static ATOMIC_FLAG inited = ATOMIC_FLAG_INIT;
if (ATOMIC_TAS(&inited))
diff --git a/common/stream/stream.h b/common/stream/stream.h
--- a/common/stream/stream.h
+++ b/common/stream/stream.h
@@ -76,7 +76,7 @@ typedef __int128_t hge;
typedef struct stream stream;
/* some os specific initialization */
-stream_export int mnstr_init(bool embedded);
+stream_export int mnstr_init(void);
typedef enum mnstr_error_kind {
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -926,7 +926,7 @@ GDKinit(opt *set, int setlen, bool embed
MT_lock_init(&GDKbbpLock[i].trim, name);
GDKbbpLock[i].free = 0;
}
- if (mnstr_init(embedded) < 0) {
+ if (mnstr_init() < 0) {
TRC_CRITICAL(GDK, "mnstr_init failed\n");
return GDK_FAIL;
}
diff --git a/tools/merovingian/daemon/merovingian.c
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -717,7 +717,7 @@ main(int argc, char *argv[])
}
/* time to initialize the stream library */
- if (mnstr_init(false) < 0) {
+ if (mnstr_init() < 0) {
Mfprintf(stderr, "cannot initialize stream library\n");
MERO_EXIT_CLEAN(1);
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
