Changeset: 52cf8254e285 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=52cf8254e285
Modified Files:
clients/Tests/exports.stable.out
common/stream/stream.c
common/stream/stream.h
Branch: Dec2011
Log Message:
Removed function rendezvous_streams.
This function hasn't been used since changeset d9fa2eb57ae2.
diffs (131 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
@@ -6472,7 +6472,6 @@ stream *open_rstream(const char *filenam
stream *open_urlstream(const char *url);
stream *open_wastream(const char *filename);
stream *open_wstream(const char *filename);
-int rendezvous_streams(stream **in, stream **out, const char *name);
stream *socket_rastream(SOCKET socket, const char *name);
stream *socket_rstream(SOCKET socket, const char *name);
stream *socket_wastream(SOCKET socket, const char *name);
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -3178,104 +3178,3 @@ wbstream(stream *s, size_t buflen)
}
return ns;
}
-
-/* ------------------------------------------------------------------ */
-
-#ifdef HAVE_PIPE
-static ssize_t
-pipe_write(stream *s, const void *buf, size_t elmsize, size_t cnt)
-{
- size_t size = elmsize * cnt;
- ssize_t sz;
-
- if (s->errnr)
- return -1;
-
- if (size == 0 || elmsize == 0)
- return (ssize_t) cnt;
- sz = write(s->stream_data.i, buf,
-#ifdef NATIVE_WIN32
- (unsigned int) /* on Windows, the length is an
unsigned int... */
-#endif
- size);
- if (sz > 0)
- return (ssize_t) (sz / elmsize);
- if (sz < 0)
- s->errnr = MNSTR_WRITE_ERROR;
- return sz;
-}
-
-static ssize_t
-pipe_read(stream *s, void *buf, size_t elmsize, size_t cnt)
-{
- ssize_t nr = 0;
- size_t res = 0, size = elmsize * cnt;
-
- if (s->errnr)
- return -1;
-
- while (res < size && (nr = read(s->stream_data.i, (void *) ((char *)
buf + res),
-#ifdef NATIVE_WIN32
- (unsigned int) /* on Windows, the
length is an unsigned int... */
-#endif
- (size - res))) > 0) {
- res += nr;
- }
- if (nr < 0) {
- s->errnr = MNSTR_READ_ERROR;
- return nr;
- }
- if (res)
- return (ssize_t) (res / elmsize);
- return 0;
-}
-
-static void
-pipe_close(stream *s)
-{
- if (s->stream_data.i >= 0)
- close(s->stream_data.i);
- s->stream_data.i = -1;
-}
-
-int
-rendezvous_streams(stream **in, stream **out, const char *name)
-{
- stream *sin, *sout;
- int pipes[2];
-
- if ((sin = create_stream(name)) == NULL)
- return 0;
- if ((sout = create_stream(name)) == NULL) {
- destroy(sin);
- return 0;
- }
- if (pipe(pipes) != 0) {
- destroy(sin);
- destroy(sout);
- return 0;
- }
- sin->access = ST_READ;
- sin->close = pipe_close;
- sin->read = pipe_read;
- sin->stream_data.i = pipes[0];
- sin->type = ST_BIN;
- sout->access = ST_WRITE;
- sout->close = pipe_close;
- sout->stream_data.i = pipes[1];
- sout->type = ST_BIN;
- sout->write = pipe_write;
- *in = sin;
- *out = sout;
- return 1;
-}
-#else
-int
-rendezvous_streams(stream **in, stream **out, const char *name)
-{
- (void) in;
- (void) out;
- (void) name;
- return 0;
-}
-#endif /* HAVE_PIPE */
diff --git a/common/stream/stream.h b/common/stream/stream.h
--- a/common/stream/stream.h
+++ b/common/stream/stream.h
@@ -177,8 +177,6 @@ stream_export stream *dupFileStream(stre
stream_export stream *iconv_rstream(stream *ss, const char *charset, const
char *name);
stream_export stream *iconv_wstream(stream *ss, const char *charset, const
char *name);
-stream_export int rendezvous_streams(stream **in, stream **out, const char
*name);
-
typedef struct buffer {
char *buf;
size_t pos;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
