xfs_db: remove db/convert.h

db/convert.h conflicts with include/convert.h and since the former only
has one declaration in it anyway, just get rid of it.  We'll need this
in the next patch to avoid an ugly include mess.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/db/Makefile b/db/Makefile
index 8fecfc1cb0f3a2f4817ccef7307cf6e365e75491..0941b32ed8a554995f0308b80b50600f90f2cffe 100644 (file)
--- a/db/Makefile
+++ b/db/Makefile
@@ -8,13 +8,13 @@ include $(TOPDIR)/include/builddefs
 LTCOMMAND = xfs_db
 
 HFILES = addr.h agf.h agfl.h agi.h attr.h attrshort.h bit.h block.h bmap.h \
-       btblock.h bmroot.h check.h command.h convert.h crc.h debug.h \
+       btblock.h bmroot.h check.h command.h crc.h debug.h \
        dir2.h dir2sf.h dquot.h echo.h faddr.h field.h \
        flist.h fprint.h frag.h freesp.h hash.h help.h init.h inode.h input.h \
        io.h logformat.h malloc.h metadump.h output.h print.h quit.h sb.h \
        sig.h strvec.h text.h type.h write.h attrset.h symlink.h fsmap.h \
        fuzz.h
-CFILES = $(HFILES:.h=.c) btdump.c info.c
+CFILES = $(HFILES:.h=.c) btdump.c convert.c info.c
 LSRCFILES = xfs_admin.sh xfs_ncheck.sh xfs_metadump.sh
 
 LLDLIBS        = $(LIBXFS) $(LIBXLOG) $(LIBFROG) $(LIBUUID) $(LIBRT) $(LIBPTHREAD)

diff --git a/db/command.c b/db/command.c
index c7c52342358ab8eb4d509abda30a59653900877b..89a78f03cb71e164aa7e642f840ab85f23ca846f 100644 (file)
--- a/db/command.c
+++ b/db/command.c
@@ -11,7 +11,6 @@
 #include "bmap.h"
 #include "check.h"
 #include "command.h"
-#include "convert.h"
 #include "debug.h"
 #include "type.h"
 #include "echo.h"

diff --git a/db/command.h b/db/command.h
index eacfd46534b1bf72a2274dadf1716a7b49dbc0ec..2f9a7e161e08296e30b59861ece3b1e6b6e7c485 100644 (file)
--- a/db/command.h
+++ b/db/command.h
@@ -28,5 +28,6 @@ extern int            command(int argc, char **argv);
 extern const cmdinfo_t *find_command(const char *cmd);
 extern void            init_commands(void);
 
+extern void            convert_init(void);
 extern void            btdump_init(void);
 extern void            info_init(void);

diff --git a/db/convert.c b/db/convert.c
index 01a088231325f0b0b72482a18c42b540762b8081..e1466057031da6cb859f2ccc1883dd7da3e89abe 100644 (file)
--- a/db/convert.c
+++ b/db/convert.c
@@ -6,7 +6,6 @@
 
 #include "libxfs.h"
 #include "command.h"
-#include "convert.h"
 #include "output.h"
 #include "init.h"
 

diff --git a/db/convert.h b/db/convert.h
deleted file mode 100644 (file)
index 3660cab..0000000
--- a/db/convert.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (c) 2000-2001,2005 Silicon Graphics, Inc.
- * All Rights Reserved.
- */
-
-extern void    convert_init(void);