aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-09-25 21:06:59 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-09-29 18:19:53 +0200
commit4b4cee0c0c99f531a45157fd27f5441e511db109 (patch)
tree825aae023f27c2f578536af35dfd01b1dc96e18e /include
parentd87bffd89b9c0a26a65f0c629250fa87902b6cb8 (diff)
Replace file/getline usage with istream
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'include')
-rw-r--r--include/compat.h6
-rw-r--r--include/fstree.h5
2 files changed, 1 insertions, 10 deletions
diff --git a/include/compat.h b/include/compat.h
index 343dcf5..111168f 100644
--- a/include/compat.h
+++ b/include/compat.h
@@ -176,12 +176,6 @@ void w32_perror(const char *str);
#endif
#endif
-#ifndef HAVE_GETLINE
-#include <stdio.h>
-
-ssize_t getline(char **line, size_t *n, FILE *fp);
-#endif
-
#ifndef HAVE_STRNDUP
char *strndup(const char *str, size_t max_len);
#endif
diff --git a/include/fstree.h b/include/fstree.h
index 6628540..884ff51 100644
--- a/include/fstree.h
+++ b/include/fstree.h
@@ -153,15 +153,12 @@ tree_node_t *fstree_add_generic(fstree_t *fs, const char *path,
tree from it. File input paths are interpreted as relative to the current
working directory.
- Data is read from the given file pointer. The filename is only used for
- producing error messages.
-
On failure, an error report with filename and line number is written
to stderr.
Returns 0 on success.
*/
-int fstree_from_file(fstree_t *fs, const char *filename, FILE *fp);
+int fstree_from_file(fstree_t *fs, const char *filename);
/*
This function performs all the necessary post processing steps on the file