Changeset: 1afcd72fc963 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1afcd72fc963
Modified Files:
clients/Tests/exports.stable.out
common/stream/compressed.c
common/stream/stream.c
common/stream/stream.h
Branch: Jun2023
Log Message:
Change interface of mnstr_name: it has always returned an unalterable string.
diffs (54 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
@@ -1656,7 +1656,7 @@ bool mnstr_get_swapbytes(const stream *s
int mnstr_init(void);
int mnstr_isalive(const stream *s);
bool mnstr_isbinary(const stream *s);
-char *mnstr_name(const stream *s);
+const char *mnstr_name(const stream *s);
const char *mnstr_peek_error(const stream *s);
int mnstr_printf(stream *restrict s, _In_z_ _Printf_format_string_ const char
*restrict format, ...) __attribute__((__format__(__printf__, 2, 3)));
ssize_t mnstr_read(stream *restrict s, void *restrict buf, size_t elmsize,
size_t cnt);
diff --git a/common/stream/compressed.c b/common/stream/compressed.c
--- a/common/stream/compressed.c
+++ b/common/stream/compressed.c
@@ -19,7 +19,7 @@ compressed_stream(stream *inner, int lev
if (inner == NULL)
return NULL;
- char *filename = mnstr_name(inner);
+ const char *filename = mnstr_name(inner);
if (filename == NULL)
return inner;
@@ -37,5 +37,3 @@ compressed_stream(stream *inner, int lev
return inner;
}
-
-
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -599,7 +599,7 @@ mnstr_eof(const stream *s)
return s->eof;
}
-char *
+const char *
mnstr_name(const stream *s)
{
if (s == NULL)
diff --git a/common/stream/stream.h b/common/stream/stream.h
--- a/common/stream/stream.h
+++ b/common/stream/stream.h
@@ -143,7 +143,7 @@ stream_export int mnstr_flush(stream *s,
stream_export int mnstr_fsync(stream *s); // used in gdk_logger.c and store.c
stream_export int mnstr_fgetpos(stream *restrict s, fpos_t *restrict p); //
unused
stream_export int mnstr_fsetpos(stream *restrict s, fpos_t *restrict p); //
unused
-stream_export char *mnstr_name(const stream *s); // used when wrapping in
mclient.c
+stream_export const char *mnstr_name(const stream *s); // used when wrapping
in mclient.c
stream_export bool mnstr_isbinary(const stream *s); // unused
stream_export bool mnstr_get_swapbytes(const stream *s); // sql_result.c/mapi10
stream_export void mnstr_set_bigendian(stream *s, bool bigendian); // used in
mapi.c and mal_session.c
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
