[WIP] [PATCH v4 10/12] erofs-utils: fuse: rename readir.c to dir.c

Gao Xiang hsiangkao at aol.com
Sun Nov 15 05:27:48 AEDT 2020


Signed-off-by: Gao Xiang <hsiangkao at aol.com>
---
 fuse/Makefile.am         |  2 +-
 fuse/{readir.c => dir.c} |  2 +-
 fuse/main.c              |  7 ++++++-
 fuse/readir.h            | 17 -----------------
 4 files changed, 8 insertions(+), 20 deletions(-)
 rename fuse/{readir.c => dir.c} (98%)
 delete mode 100644 fuse/readir.h

diff --git a/fuse/Makefile.am b/fuse/Makefile.am
index 21a1ee975141..4ed4215b9936 100644
--- a/fuse/Makefile.am
+++ b/fuse/Makefile.am
@@ -3,7 +3,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 bin_PROGRAMS     = erofsfuse
-erofsfuse_SOURCES = main.c readir.c
+erofsfuse_SOURCES = dir.c main.c
 erofsfuse_CFLAGS = -Wall -Werror \
                    -I$(top_srcdir)/include \
                    $(shell pkg-config fuse --cflags) \
diff --git a/fuse/readir.c b/fuse/dir.c
similarity index 98%
rename from fuse/readir.c
rename to fuse/dir.c
index 2e90c95c38aa..f6c1295f52bd 100644
--- a/fuse/readir.c
+++ b/fuse/dir.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * erofs-utils/fuse/readir.c
+ * erofs-utils/fuse/dir.c
  *
  * Created by Li Guifu <blucerlee at gmail.com>
  */
diff --git a/fuse/main.c b/fuse/main.c
index a4b7a3692c19..236d54635acb 100644
--- a/fuse/main.c
+++ b/fuse/main.c
@@ -11,10 +11,15 @@
 #include <signal.h>
 #include <stddef.h>
 
+#include <fuse.h>
+#include <fuse_opt.h>
+
 #include "erofs/print.h"
-#include "readir.h"
 #include "erofs/io.h"
 
+int erofsfuse_readdir(const char *path, void *buffer, fuse_fill_dir_t filler,
+		      off_t offset, struct fuse_file_info *fi);
+
 /* XXX: after liberofs is linked in, it should be removed */
 struct erofs_configure cfg;
 
diff --git a/fuse/readir.h b/fuse/readir.h
deleted file mode 100644
index 16b878fe9f29..000000000000
--- a/fuse/readir.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * erofs-utils/fuse/readir.h
- *
- * Created by Li Guifu <blucerlee at gmail.com>
- */
-#ifndef __EROFS_READDIR_H
-#define __EROFS_READDIR_H
-
-#include <fuse.h>
-#include <fuse_opt.h>
-
-int erofsfuse_readdir(const char *path, void *buffer, fuse_fill_dir_t filler,
-		      off_t offset, struct fuse_file_info *fi);
-
-
-#endif
-- 
2.24.0



More information about the Linux-erofs mailing list