aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2023-06-19 18:57:38 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2023-06-20 10:57:38 +0200
commitca9b6ba17257f88b8d575f18cab0b1e23660cfa5 (patch)
tree355d8dbedb496f0235b08aba1bb73e41ba4083ba /include
parentcb5473418b1f3b26555e26840a87a6feed3f583b (diff)
Move istream_get_line function to libutil
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'include')
-rw-r--r--include/fstree.h1
-rw-r--r--include/io/dir_iterator.h2
-rw-r--r--include/io/mem.h2
-rw-r--r--include/io/std.h2
-rw-r--r--include/io/xfrm.h2
-rw-r--r--include/tar/tar.h1
-rw-r--r--include/util/parse.h (renamed from include/io/istream.h)10
7 files changed, 9 insertions, 11 deletions
diff --git a/include/fstree.h b/include/fstree.h
index 779cd28..3c3782e 100644
--- a/include/fstree.h
+++ b/include/fstree.h
@@ -16,7 +16,6 @@
#include "sqfs/predef.h"
#include "io/dir_entry.h"
-#include "io/istream.h"
#include "compat.h"
typedef struct fstree_defaults_t fstree_defaults_t;
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/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
diff --git a/include/tar/tar.h b/include/tar/tar.h
index 1f1b1b4..52a0562 100644
--- a/include/tar/tar.h
+++ b/include/tar/tar.h
@@ -9,7 +9,6 @@
#include "config.h"
#include "compat.h"
-#include "io/istream.h"
#include "io/dir_iterator.h"
#include "sqfs/io.h"
diff --git a/include/io/istream.h b/include/util/parse.h
index f41be2e..bc635ad 100644
--- a/include/io/istream.h
+++ b/include/util/parse.h
@@ -1,11 +1,11 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* SPDX-License-Identifier: LGPL-3.0-or-later */
/*
- * istream.h
+ * parse.h
*
* Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
*/
-#ifndef IO_ISTREAM_H
-#define IO_ISTREAM_H
+#ifndef UTIL_PARSE_H
+#define UTIL_PARSE_H
#include "sqfs/predef.h"
@@ -52,4 +52,4 @@ SQFS_INTERNAL int istream_get_line(sqfs_istream_t *strm, char **out,
}
#endif
-#endif /* IO_ISTREAM_H */
+#endif /* UTIL_PARSE_H */