MonetDB: default - Removed functions append_wstream and append_w...

[Sjoerd Mullender]

Changeset: 1e864e4130c3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1e864e4130c3
Modified Files:
        clients/Tests/exports.stable.out
        common/stream/ChangeLog
        common/stream/stream.c
        common/stream/stream.h
Branch: default
Log Message:

Removed functions append_wstream and append_wastream.


diffs (144 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
@@ -2598,8 +2598,6 @@ str wlrRef;
 str zero_or_oneRef;
 
 # stream
-stream *append_wastream(const char *filename);
-stream *append_wstream(const char *filename);
 stream *block_stream(stream *s);
 stream *block_stream2(stream *s, size_t bufsiz, compression_method comp, 
column_compression colcomp);
 buffer bs2_buffer(stream *s);
diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog
--- a/common/stream/ChangeLog
+++ b/common/stream/ChangeLog
@@ -2,5 +2,6 @@
 # This file is updated with Maddlog
 
 * Mon Aug  7 2017 Sjoerd Mullender <sjo...@acm.org>
+- Removed functions append_wstream and append_wastream.
 - Removed functions mnstr_rstream and mnstr_wstream.
 
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -1708,8 +1708,8 @@ open_rstream(const char *filename)
        return s;
 }
 
-static stream *
-open_wstream_(const char *filename, char *mode)
+stream *
+open_wstream(const char *filename)
 {
        stream *s;
        const char *ext;
@@ -1722,13 +1722,13 @@ open_wstream_(const char *filename, char
        ext = get_extention(filename);
 
        if (strcmp(ext, "gz") == 0)
-               return open_gzwstream(filename, mode);
+               return open_gzwstream(filename, "wb");
        if (strcmp(ext, "bz2") == 0)
-               return open_bzwstream(filename, mode);
+               return open_bzwstream(filename, "wb");
        if (strcmp(ext, "xz") == 0)
-               return open_xzwstream(filename, mode);
-
-       if ((s = open_stream(filename, mode)) == NULL)
+               return open_xzwstream(filename, "wb");
+
+       if ((s = open_stream(filename, "wb")) == NULL)
                return NULL;
        s->access = ST_WRITE;
        s->type = ST_BIN;
@@ -1744,18 +1744,6 @@ open_wstream_(const char *filename, char
 }
 
 stream *
-open_wstream(const char *filename)
-{
-       return open_wstream_(filename, "wb");
-}
-
-stream *
-append_wstream(const char *filename)
-{
-       return open_wstream_(filename, "ab");
-}
-
-stream *
 open_rastream(const char *filename)
 {
        stream *s;
@@ -1781,8 +1769,8 @@ open_rastream(const char *filename)
        return s;
 }
 
-static stream *
-open_wastream_(const char *filename, char *mode)
+stream *
+open_wastream(const char *filename)
 {
        stream *s;
        const char *ext;
@@ -1795,31 +1783,19 @@ open_wastream_(const char *filename, cha
        ext = get_extention(filename);
 
        if (strcmp(ext, "gz") == 0)
-               return open_gzwastream(filename, mode);
+               return open_gzwastream(filename, "w");
        if (strcmp(ext, "bz2") == 0)
-               return open_bzwastream(filename, mode);
+               return open_bzwastream(filename, "w");
        if (strcmp(ext, "xz") == 0)
-               return open_xzwastream(filename, mode);
-
-       if ((s = open_stream(filename, mode)) == NULL)
+               return open_xzwastream(filename, "w");
+
+       if ((s = open_stream(filename, "w")) == NULL)
                return NULL;
        s->access = ST_WRITE;
        s->type = ST_ASCII;
        return s;
 }
 
-stream *
-open_wastream(const char *filename)
-{
-       return open_wastream_(filename, "w");
-}
-
-stream *
-append_wastream(const char *filename)
-{
-       return open_wastream_(filename, "a");
-}
-
 /* ------------------------------------------------------------------ */
 /* streams working on a remote file using cURL */
 
diff --git a/common/stream/stream.h b/common/stream/stream.h
--- a/common/stream/stream.h
+++ b/common/stream/stream.h
@@ -162,18 +162,12 @@ stream_export int mnstr_isalive(stream *
 stream_export stream *open_rstream(const char *filename);
 stream_export stream *open_wstream(const char *filename);
 
-/* append to stream */
-stream_export stream *append_wstream(const char *filename);
-
 /* open in ascii stream in read mode */
 stream_export stream *open_rastream(const char *filename);
 
 /* open in ascii stream in write mode*/
 stream_export stream *open_wastream(const char *filename);
 
-/* append to ascii stream */
-stream_export stream *append_wastream(const char *filename);
-
 stream_export void close_stream(stream *s);
 
 stream_export stream *open_urlstream(const char *url);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list