[PATCH 2/3] erofs-utils: lib: unexport "erofs/rebuild.h"

[Gao Xiang]

Disallow external users to use those unstable APIs for now.

Signed-off-by: Gao Xiang <hsiangkao at linux.alibaba.com>
---
 lib/Makefile.am                                   |  2 +-
 lib/inode.c                                       |  3 +--
 include/erofs/rebuild.h => lib/liberofs_rebuild.h | 15 ++++-----------
 lib/rebuild.c                                     |  2 +-
 lib/remotes/s3.c                                  |  2 +-
 lib/tar.c                                         |  2 +-
 mkfs/main.c                                       |  2 +-
 7 files changed, 10 insertions(+), 18 deletions(-)
 rename include/erofs/rebuild.h => lib/liberofs_rebuild.h (73%)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7487433..4c73012 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -24,12 +24,12 @@ noinst_HEADERS = $(top_srcdir)/include/erofs_fs.h \
       $(top_srcdir)/include/erofs/xattr.h \
       $(top_srcdir)/include/erofs/compress_hints.h \
       $(top_srcdir)/include/erofs/fragments.h \
-      $(top_srcdir)/include/erofs/rebuild.h \
       $(top_srcdir)/include/erofs/importer.h \
       $(top_srcdir)/lib/liberofs_base64.h \
       $(top_srcdir)/lib/liberofs_cache.h \
       $(top_srcdir)/lib/liberofs_compress.h \
       $(top_srcdir)/lib/liberofs_private.h \
+      $(top_srcdir)/lib/liberofs_rebuild.h \
       $(top_srcdir)/lib/liberofs_xxhash.h \
       $(top_srcdir)/lib/liberofs_gzran.h \
       $(top_srcdir)/lib/liberofs_metabox.h \
diff --git a/lib/inode.c b/lib/inode.c
index 0b5e77a..810ffc2 100644
--- a/lib/inode.c
+++ b/lib/inode.c
@@ -30,6 +30,7 @@
 #include "liberofs_compress.h"
 #include "liberofs_private.h"
 #include "liberofs_metabox.h"
+#include "liberofs_rebuild.h"
 
 static inline bool erofs_is_special_identifier(const char *path)
 {
@@ -1684,8 +1685,6 @@ err_closedir:
 	return ret;
 }
 
-int erofs_rebuild_load_basedir(struct erofs_inode *dir);
-
 bool erofs_dentry_is_wht(struct erofs_sb_info *sbi, struct erofs_dentry *d)
 {
 	if (!d->validnid)
diff --git a/include/erofs/rebuild.h b/lib/liberofs_rebuild.h
similarity index 73%
rename from include/erofs/rebuild.h
rename to lib/liberofs_rebuild.h
index 59b2f6f..1eb79cf 100644
--- a/include/erofs/rebuild.h
+++ b/lib/liberofs_rebuild.h
@@ -1,13 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0+ OR Apache-2.0 */
-#ifndef __EROFS_REBUILD_H
-#define __EROFS_REBUILD_H
+#ifndef __EROFS_LIB_LIBEROFS_REBUILD_H
+#define __EROFS_LIB_LIBEROFS_REBUILD_H
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#include "internal.h"
+#include "erofs/internal.h"
 
 enum erofs_rebuild_datamode {
 	EROFS_REBUILD_DATA_BLOB_INDEX,
@@ -21,8 +16,6 @@ struct erofs_dentry *erofs_rebuild_get_dentry(struct erofs_inode *pwd,
 int erofs_rebuild_load_tree(struct erofs_inode *root, struct erofs_sb_info *sbi,
 			    enum erofs_rebuild_datamode mode);
 
-#ifdef __cplusplus
-}
-#endif
+int erofs_rebuild_load_basedir(struct erofs_inode *dir);
 
 #endif
diff --git a/lib/rebuild.c b/lib/rebuild.c
index e3c7eb8..83e30fd 100644
--- a/lib/rebuild.c
+++ b/lib/rebuild.c
@@ -10,11 +10,11 @@
 #endif
 #include "erofs/print.h"
 #include "erofs/inode.h"
-#include "erofs/rebuild.h"
 #include "erofs/dir.h"
 #include "erofs/xattr.h"
 #include "erofs/blobchunk.h"
 #include "erofs/internal.h"
+#include "liberofs_rebuild.h"
 #include "liberofs_uuid.h"
 
 #ifdef HAVE_LINUX_AUFS_TYPE_H
diff --git a/lib/remotes/s3.c b/lib/remotes/s3.c
index 0296ef4..2e7763e 100644
--- a/lib/remotes/s3.c
+++ b/lib/remotes/s3.c
@@ -16,8 +16,8 @@
 #include "erofs/inode.h"
 #include "erofs/blobchunk.h"
 #include "erofs/diskbuf.h"
-#include "erofs/rebuild.h"
 #include "erofs/importer.h"
+#include "liberofs_rebuild.h"
 #include "liberofs_s3.h"
 
 #define S3EROFS_PATH_MAX		1024
diff --git a/lib/tar.c b/lib/tar.c
index 100efb3..139d1c5 100644
--- a/lib/tar.c
+++ b/lib/tar.c
@@ -10,7 +10,6 @@
 #include "erofs/tar.h"
 #include "erofs/xattr.h"
 #include "erofs/blobchunk.h"
-#include "erofs/rebuild.h"
 #include "erofs/importer.h"
 #if defined(HAVE_ZLIB)
 #include <zlib.h>
@@ -18,6 +17,7 @@
 #include "liberofs_base64.h"
 #include "liberofs_cache.h"
 #include "liberofs_gzran.h"
+#include "liberofs_rebuild.h"
 
 /* This file is a tape/volume header.  Ignore it on extraction.  */
 #define GNUTYPE_VOLHDR 'V'
diff --git a/mkfs/main.c b/mkfs/main.c
index fb69a5f..7a538bd 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -26,12 +26,12 @@
 #include "erofs/compress_hints.h"
 #include "erofs/blobchunk.h"
 #include "erofs/fragments.h"
-#include "erofs/rebuild.h"
 #include "../lib/compressor.h"
 #include "../lib/liberofs_gzran.h"
 #include "../lib/liberofs_metabox.h"
 #include "../lib/liberofs_oci.h"
 #include "../lib/liberofs_private.h"
+#include "../lib/liberofs_rebuild.h"
 #include "../lib/liberofs_s3.h"
 #include "../lib/liberofs_uuid.h"
 
-- 
2.43.5