Changeset: 6fbd26d2d8cd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/6fbd26d2d8cd
Branch: nested
Log Message:
merged
diffs (88 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
@@ -1767,7 +1767,6 @@ stream *socket_wstream(SOCKET socket, co
stream *stderr_wastream(void);
stream *stdin_rastream(void);
stream *stdout_wastream(void);
-stream *stream_blackhole_create(void);
stream *stream_fwf_create(stream *restrict s, size_t num_fields, size_t
*restrict widths, char filler);
stream *xz_stream(stream *inner, int preset);
diff --git a/common/stream/CMakeLists.txt b/common/stream/CMakeLists.txt
--- a/common/stream/CMakeLists.txt
+++ b/common/stream/CMakeLists.txt
@@ -39,7 +39,6 @@ target_sources(stream
mapi_stream.c
memio.c
callback.c
- blackhole.c
fwf.c
text_stream.c
$<$<BOOL:${OPENSSL_FOUND}>:openssl_stream.c>
diff --git a/common/stream/blackhole.c b/common/stream/blackhole.c
deleted file mode 100644
--- a/common/stream/blackhole.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * SPDX-License-Identifier: MPL-2.0
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright 2024, 2025 MonetDB Foundation;
- * Copyright August 2008 - 2023 MonetDB B.V.;
- * Copyright 1997 - July 2008 CWI.
- */
-
-#include "monetdb_config.h"
-#include "stream.h"
-#include "stream_internal.h"
-
-
-
-static ssize_t
-stream_blackhole_write(stream *restrict s, const void *restrict buf, size_t
elmsize, size_t cnt)
-{
- (void) s;
- (void) buf;
- (void) elmsize;
- return (ssize_t) cnt;
-}
-
-static void
-stream_blackhole_close(stream *s)
-{
- (void) s;
- /* no resources to close */
-}
-
-stream *
-stream_blackhole_create(void)
-{
- stream *s;
- if ((s = create_stream("blackhole")) == NULL) {
- return NULL;
- }
-
- s->read = NULL;
- s->write = stream_blackhole_write;
- s->close = stream_blackhole_close;
- s->flush = NULL;
- s->readonly = false;
- return s;
-}
diff --git a/common/stream/stream.h b/common/stream/stream.h
--- a/common/stream/stream.h
+++ b/common/stream/stream.h
@@ -269,8 +269,6 @@ stream_export stream *callback_stream(
void (*destroy)(void *priv),
const char *restrict name); // used in mclient.c, for readline
-stream_export stream *stream_blackhole_create(void); // never used
-
stream_export stream *stream_fwf_create(stream *restrict s, size_t num_fields,
size_t *restrict widths, char filler); // sql.c
stream_export stream *create_text_stream(stream *s);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
