Move istream_get_line function to libutil

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

5 files changed, 4 insertions, 59 deletions

diff --git a/include/io/dir_iterator.h b/include/io/dir_iterator.h
index 152eb93..1ea3321 100644
--- a/include/io/dir_iterator.h
+++ b/include/io/dir_iterator.h
@@ -8,7 +8,7 @@
 #define IO_DIR_ITERATOR_H
 
 #include "io/dir_entry.h"
-#include "io/istream.h"
+#include "sqfs/predef.h"
 
 /**
  * @interface dir_iterator_t
diff --git a/include/io/istream.h b/include/io/istream.h
deleted file mode 100644
index f41be2e..0000000
--- a/include/io/istream.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
-/*
- * istream.h
- *
- * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
- */
-#ifndef IO_ISTREAM_H
-#define IO_ISTREAM_H
-
-#include "sqfs/predef.h"
-
-enum {
-	ISTREAM_LINE_LTRIM = 0x01,
-	ISTREAM_LINE_RTRIM = 0x02,
-	ISTREAM_LINE_SKIP_EMPTY = 0x04,
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @brief Read a line of text from an input stream
- *
- * @memberof sqfs_istream_t
- *
- * The line returned is allocated using malloc and must subsequently be
- * freed when it is no longer needed. The line itself is always null-terminated
- * and never includes the line break characters (LF or CR-LF).
- *
- * If the flag @ref ISTREAM_LINE_LTRIM is set, leading white space characters
- * are removed. If the flag @ref ISTREAM_LINE_RTRIM is set, trailing white space
- * characters are remvoed.
- *
- * If the flag @ref ISTREAM_LINE_SKIP_EMPTY is set and a line is discovered to
- * be empty (after the optional trimming), the function discards the empty line
- * and retries. The given line_num pointer is used to increment the line
- * number.
- *
- * @param strm A pointer to an input stream.
- * @param out Returns a pointer to a line on success.
- * @param line_num This is incremented if lines are skipped.
- * @param flags A combination of flags controling the functions behaviour.
- *
- * @return Zero on success, a negative value on error, a positive value if
- *         end-of-file was reached without reading any data.
- */
-SQFS_INTERNAL int istream_get_line(sqfs_istream_t *strm, char **out,
-				   size_t *line_num, int flags);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* IO_ISTREAM_H */
diff --git a/include/io/mem.h b/include/io/mem.h
index c848ef0..20b04ab 100644
--- a/include/io/mem.h
+++ b/include/io/mem.h
@@ -7,7 +7,7 @@
 #ifndef IO_MEM_STREAM_H
 #define IO_MEM_STREAM_H
 
-#include "io/istream.h"
+#include "sqfs/predef.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/io/std.h b/include/io/std.h
index c5dddfa..a9f436a 100644
--- a/include/io/std.h
+++ b/include/io/std.h
@@ -7,7 +7,7 @@
 #ifndef IO_STD_H
 #define IO_STD_H
 
-#include "io/istream.h"
+#include "sqfs/io.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/io/xfrm.h b/include/io/xfrm.h
index f0ff1ce..21ffa57 100644
--- a/include/io/xfrm.h
+++ b/include/io/xfrm.h
@@ -7,7 +7,7 @@
 #ifndef IO_XFRM_H
 #define IO_XFRM_H
 
-#include "io/istream.h"
+#include "sqfs/predef.h"
 #include "xfrm/stream.h"
 
 #ifdef __cplusplus