libsqfs: Internalize sqfs_dir_reader_find function

The only user in the code base is sqfs_dir_reader_find_by_path.

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

2 files changed, 20 insertions, 37 deletions

diff --git a/include/sqfs/dir_reader.h b/include/sqfs/dir_reader.h
index cb071c2..abd49bd 100644
--- a/include/sqfs/dir_reader.h
+++ b/include/sqfs/dir_reader.h
@@ -166,19 +166,6 @@ SQFS_API int sqfs_dir_reader_open_dir(sqfs_dir_reader_t *rd,
 SQFS_API int sqfs_dir_reader_rewind(sqfs_dir_reader_t *rd);
 
 /**
- * @brief Seek through the current directory listing to locate an
- *        entry by name.
- *
- * @memberof sqfs_dir_reader_t
- *
- * @param rd A pointer to a directory reader.
- * @param name The name of the entry to find.
- *
- * @return Zero on success, an @ref SQFS_ERROR value on failure.
- */
-SQFS_API int sqfs_dir_reader_find(sqfs_dir_reader_t *rd, const char *name);
-
-/**
  * @brief Read a directory entry and advance the internal position indicator
  *        to the next one.
  *
diff --git a/lib/sqfs/src/dir_reader.c b/lib/sqfs/src/dir_reader.c
index d5a8cbd..c44198e 100644
--- a/lib/sqfs/src/dir_reader.c
+++ b/lib/sqfs/src/dir_reader.c
@@ -301,29 +301,6 @@ int sqfs_dir_reader_rewind(sqfs_dir_reader_t *rd)
 	return 0;
 }
 
-int sqfs_dir_reader_find(sqfs_dir_reader_t *rd, const char *name)
-{
-	sqfs_dir_node_t *ent;
-	int ret;
-
-	ret = sqfs_dir_reader_rewind(rd);
-	if (ret != 0)
-		return ret;
-
-	do {
-		ret = sqfs_dir_reader_read(rd, &ent);
-		if (ret < 0)
-			return ret;
-		if (ret > 0)
-			return SQFS_ERROR_NO_ENTRY;
-
-		ret = strcmp((const char *)ent->name, name);
-		free(ent);
-	} while (ret < 0);
-
-	return ret == 0 ? 0 : SQFS_ERROR_NO_ENTRY;
-}
-
 int sqfs_dir_reader_get_inode(sqfs_dir_reader_t *rd,
 			      sqfs_inode_generic_t **inode)
 {
@@ -353,6 +330,25 @@ int sqfs_dir_reader_get_root_inode(sqfs_dir_reader_t *rd,
 	return dcache_add(rd, *inode, rd->super.root_inode_ref);
 }
 
+static int find_entry(sqfs_dir_reader_t *rd, const char *name)
+{
+	sqfs_dir_node_t *ent;
+	int ret;
+
+	do {
+		ret = sqfs_dir_reader_read(rd, &ent);
+		if (ret < 0)
+			return ret;
+		if (ret > 0)
+			return SQFS_ERROR_NO_ENTRY;
+
+		ret = strcmp((const char *)ent->name, name);
+		free(ent);
+	} while (ret < 0);
+
+	return ret == 0 ? 0 : SQFS_ERROR_NO_ENTRY;
+}
+
 int sqfs_dir_reader_find_by_path(sqfs_dir_reader_t *rd,
 				 const sqfs_inode_generic_t *start,
 				 const char *path, sqfs_inode_generic_t **out)
@@ -389,7 +385,7 @@ int sqfs_dir_reader_find_by_path(sqfs_dir_reader_t *rd,
 		if (name == NULL)
 			return SQFS_ERROR_ALLOC;
 
-		ret = sqfs_dir_reader_find(rd, name);
+		ret = find_entry(rd, name);
 		free(name);
 		if (ret)
 			return ret;