libfrog: promote avl64 code from xfs_repair

xfs_scrub will make use of the avl64 code, so promote it out of repair
and into libfrog.

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

diff --git a/repair/avl64.h b/include/avl64.h
similarity index 100%
rename from repair/avl64.h
rename to include/avl64.h

diff --git a/libfrog/Makefile b/libfrog/Makefile
index 6034da5676394abdbb0659d175975137b396b74a..3fd42a4359610d2591707dac1cd26e6e248a871f 100644 (file)
--- a/libfrog/Makefile
+++ b/libfrog/Makefile
@@ -11,6 +11,7 @@ LT_REVISION = 0
 LT_AGE = 0
 
 CFILES = \
+avl64.c \
 list_sort.c \
 radix-tree.c \
 util.c

diff --git a/repair/avl64.c b/libfrog/avl64.c
similarity index 99%
rename from repair/avl64.c
rename to libfrog/avl64.c
index 8f4a12118049d9556766ac25231343e763cc6c58..01cfee437b64cc840c6cca09da04519d8e138f2b 100644 (file)
--- a/repair/avl64.c
+++ b/libfrog/avl64.c
@@ -15,9 +15,9 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
+#include <stdint.h>
 #include <stdio.h>
-#include "libxfs.h"
+#include "platform_defs.h"
 #include "avl64.h"
 
 #define CERT   ASSERT

diff --git a/repair/Makefile b/repair/Makefile
index 4184a70f6254b9093f8e0906e6deb1e92129cc5a..c348cec989b7034038aec690795d141fa4ba69cd 100644 (file)
--- a/repair/Makefile
+++ b/repair/Makefile
@@ -9,11 +9,11 @@ LSRCFILES = README
 
 LTCOMMAND = xfs_repair
 
-HFILES = agheader.h attr_repair.h avl.h avl64.h bmap.h btree.h \
+HFILES = agheader.h attr_repair.h avl.h bmap.h btree.h \
        da_util.h dinode.h dir2.h err_protos.h globals.h incore.h protos.h \
        rt.h progress.h scan.h versions.h prefetch.h rmap.h slab.h threads.h
 
-CFILES = agheader.c attr_repair.c avl.c avl64.c bmap.c btree.c \
+CFILES = agheader.c attr_repair.c avl.c bmap.c btree.c \
        da_util.c dino_chunks.c dinode.c dir2.c globals.c incore.c \
        incore_bmc.c init.c incore_ext.c incore_ino.c phase1.c \
        phase2.c phase3.c phase4.c phase5.c phase6.c phase7.c \