From: Darrick J. Wong Date: Mon, 9 Sep 2019 19:37:07 +0000 (-0400) Subject: libfrog: move path.h to libfrog/ X-Git-Tag: v5.3.0-rc2~135 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42b4c8e87a9d9e3d52477507222835db912c5603;p=thirdparty%2Fxfsprogs-dev.git libfrog: move path.h to libfrog/ Move this header to libfrog since the code is there already. Signed-off-by: Darrick J. Wong Reviewed-by: Dave Chinner Signed-off-by: Eric Sandeen --- diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c index 1fd89eb83..a53eb924b 100644 --- a/fsr/xfs_fsr.c +++ b/fsr/xfs_fsr.c @@ -10,7 +10,7 @@ #include "jdm.h" #include "xfs_bmap_btree.h" #include "xfs_attr_sf.h" -#include "path.h" +#include "libfrog/paths.h" #include "libfrog/fsgeom.h" #include "libfrog/bulkstat.h" diff --git a/growfs/xfs_growfs.c b/growfs/xfs_growfs.c index a3fe74ae5..eab15984b 100644 --- a/growfs/xfs_growfs.c +++ b/growfs/xfs_growfs.c @@ -5,7 +5,7 @@ */ #include "libxfs.h" -#include "path.h" +#include "libfrog/paths.h" #include "libfrog/fsgeom.h" static void diff --git a/include/Makefile b/include/Makefile index 2a00dea92..fc90bc483 100644 --- a/include/Makefile +++ b/include/Makefile @@ -28,7 +28,6 @@ LIBHFILES = libxfs.h \ xfs_trans.h \ command.h \ input.h \ - path.h \ project.h \ platform_defs.h diff --git a/io/cowextsize.c b/io/cowextsize.c index 029605afe..da5c6680c 100644 --- a/io/cowextsize.c +++ b/io/cowextsize.c @@ -14,7 +14,7 @@ #include "init.h" #include "io.h" #include "input.h" -#include "path.h" +#include "libfrog/paths.h" static cmdinfo_t cowextsize_cmd; static long cowextsize; diff --git a/io/encrypt.c b/io/encrypt.c index 8db352592..7a0b2465f 100644 --- a/io/encrypt.c +++ b/io/encrypt.c @@ -7,7 +7,7 @@ #include "platform_defs.h" #include "command.h" #include "init.h" -#include "path.h" +#include "libfrog/paths.h" #include "io.h" #ifndef ARRAY_SIZE diff --git a/io/fsmap.c b/io/fsmap.c index e91ffc368..12ec1e442 100644 --- a/io/fsmap.c +++ b/io/fsmap.c @@ -6,7 +6,7 @@ #include "platform_defs.h" #include "command.h" #include "init.h" -#include "path.h" +#include "libfrog/paths.h" #include "io.h" #include "input.h" #include "libfrog/fsgeom.h" diff --git a/io/io.h b/io/io.h index 0848ab989..00dff2b70 100644 --- a/io/io.h +++ b/io/io.h @@ -5,7 +5,7 @@ */ #include "xfs.h" -#include "path.h" +#include "libfrog/paths.h" /* * Read/write patterns (default is always "forward") diff --git a/io/label.c b/io/label.c index 72e079648..890ddde4c 100644 --- a/io/label.c +++ b/io/label.c @@ -6,7 +6,7 @@ #include #include "platform_defs.h" #include "libxfs.h" -#include "path.h" +#include "libfrog/paths.h" #include "command.h" #include "init.h" #include "io.h" diff --git a/io/parent.c b/io/parent.c index 18bbf9b8c..a78b45884 100644 --- a/io/parent.c +++ b/io/parent.c @@ -6,7 +6,7 @@ #include "command.h" #include "input.h" -#include "path.h" +#include "libfrog/paths.h" #include "parent.h" #include "handle.h" #include "jdm.h" diff --git a/io/scrub.c b/io/scrub.c index 052497be5..9d1c62b52 100644 --- a/io/scrub.c +++ b/io/scrub.c @@ -9,7 +9,7 @@ #include "command.h" #include "input.h" #include "init.h" -#include "path.h" +#include "libfrog/paths.h" #include "io.h" static struct cmdinfo scrub_cmd; diff --git a/libfrog/Makefile b/libfrog/Makefile index 715589c7a..f8f7de68c 100644 --- a/libfrog/Makefile +++ b/libfrog/Makefile @@ -37,6 +37,7 @@ crc32cselftest.h \ crc32defs.h \ crc32table.h \ fsgeom.h \ +paths.h \ ptvar.h \ radix-tree.h \ topology.h \ diff --git a/libfrog/paths.c b/libfrog/paths.c index 6e266654b..f0f4548ee 100644 --- a/libfrog/paths.c +++ b/libfrog/paths.c @@ -12,7 +12,7 @@ #include #include #include -#include "path.h" +#include "paths.h" #include "input.h" #include "project.h" #include diff --git a/include/path.h b/libfrog/paths.h similarity index 95% rename from include/path.h rename to libfrog/paths.h index 2d6c3c532..c08e37333 100644 --- a/include/path.h +++ b/libfrog/paths.h @@ -3,8 +3,8 @@ * Copyright (c) 2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#ifndef __PATH_H__ -#define __PATH_H__ +#ifndef __LIBFROG_PATH_H__ +#define __LIBFROG_PATH_H__ #include "platform_defs.h" @@ -58,4 +58,4 @@ typedef struct fs_cursor { extern void fs_cursor_initialise(char *__dir, uint __flags, fs_cursor_t *__cp); extern fs_path_t *fs_cursor_next_entry(fs_cursor_t *__cp); -#endif /* __PATH_H__ */ +#endif /* __LIBFROG_PATH_H__ */ diff --git a/quota/init.c b/quota/init.c index 8244e38d1..942582759 100644 --- a/quota/init.c +++ b/quota/init.c @@ -4,7 +4,7 @@ * All Rights Reserved. */ -#include "path.h" +#include "libfrog/paths.h" #include "command.h" #include "input.h" #include "init.h" diff --git a/quota/quota.h b/quota/quota.h index b7f259e8a..5db0a7419 100644 --- a/quota/quota.h +++ b/quota/quota.h @@ -5,7 +5,7 @@ */ #include "xqm.h" -#include "path.h" +#include "libfrog/paths.h" #include "project.h" #include diff --git a/scrub/common.c b/scrub/common.c index 1cd2b7ba6..7db470445 100644 --- a/scrub/common.c +++ b/scrub/common.c @@ -8,7 +8,7 @@ #include #include #include "platform_defs.h" -#include "path.h" +#include "libfrog/paths.h" #include "xfs_scrub.h" #include "common.h" #include "progress.h" diff --git a/scrub/disk.c b/scrub/disk.c index dd1095331..91e13140b 100644 --- a/scrub/disk.c +++ b/scrub/disk.c @@ -18,7 +18,7 @@ #endif #include "platform_defs.h" #include "libfrog.h" -#include "path.h" +#include "libfrog/paths.h" #include "xfs_scrub.h" #include "common.h" #include "disk.h" diff --git a/scrub/filemap.c b/scrub/filemap.c index dc8f48817..bdc6d8f90 100644 --- a/scrub/filemap.c +++ b/scrub/filemap.c @@ -10,7 +10,7 @@ #include #include #include -#include "path.h" +#include "libfrog/paths.h" #include "xfs_scrub.h" #include "common.h" #include "filemap.h" diff --git a/scrub/fscounters.c b/scrub/fscounters.c index 9635c44f5..8e4b34675 100644 --- a/scrub/fscounters.c +++ b/scrub/fscounters.c @@ -10,7 +10,7 @@ #include "platform_defs.h" #include "xfs_arch.h" #include "xfs_format.h" -#include "path.h" +#include "libfrog/paths.h" #include "libfrog/workqueue.h" #include "xfs_scrub.h" #include "common.h" diff --git a/scrub/inodes.c b/scrub/inodes.c index 19923de57..580a845e2 100644 --- a/scrub/inodes.c +++ b/scrub/inodes.c @@ -12,7 +12,7 @@ #include "xfs_arch.h" #include "xfs_format.h" #include "handle.h" -#include "path.h" +#include "libfrog/paths.h" #include "libfrog/workqueue.h" #include "xfs_scrub.h" #include "common.h" diff --git a/scrub/phase1.c b/scrub/phase1.c index d0e77cabe..d123c4199 100644 --- a/scrub/phase1.c +++ b/scrub/phase1.c @@ -16,7 +16,7 @@ #include "libfrog.h" #include "libfrog/workqueue.h" #include "input.h" -#include "path.h" +#include "libfrog/paths.h" #include "handle.h" #include "bitops.h" #include "libfrog/avl64.h" diff --git a/scrub/phase2.c b/scrub/phase2.c index baec11dd9..f064c83d8 100644 --- a/scrub/phase2.c +++ b/scrub/phase2.c @@ -8,7 +8,7 @@ #include #include #include "list.h" -#include "path.h" +#include "libfrog/paths.h" #include "libfrog/workqueue.h" #include "xfs_scrub.h" #include "common.h" diff --git a/scrub/phase3.c b/scrub/phase3.c index 64a499c3b..5eff79071 100644 --- a/scrub/phase3.c +++ b/scrub/phase3.c @@ -8,7 +8,7 @@ #include #include #include "list.h" -#include "path.h" +#include "libfrog/paths.h" #include "libfrog/workqueue.h" #include "xfs_scrub.h" #include "common.h" diff --git a/scrub/phase4.c b/scrub/phase4.c index 140748358..589777f61 100644 --- a/scrub/phase4.c +++ b/scrub/phase4.c @@ -9,7 +9,7 @@ #include #include #include "list.h" -#include "path.h" +#include "libfrog/paths.h" #include "libfrog/workqueue.h" #include "xfs_scrub.h" #include "common.h" diff --git a/scrub/phase5.c b/scrub/phase5.c index ab015821a..3ff342514 100644 --- a/scrub/phase5.c +++ b/scrub/phase5.c @@ -14,7 +14,7 @@ #include #include "handle.h" #include "list.h" -#include "path.h" +#include "libfrog/paths.h" #include "libfrog/workqueue.h" #include "xfs_scrub.h" #include "common.h" diff --git a/scrub/phase6.c b/scrub/phase6.c index d0e62cea9..506e75d2a 100644 --- a/scrub/phase6.c +++ b/scrub/phase6.c @@ -8,7 +8,7 @@ #include #include #include "handle.h" -#include "path.h" +#include "libfrog/paths.h" #include "libfrog/workqueue.h" #include "xfs_scrub.h" #include "common.h" diff --git a/scrub/phase7.c b/scrub/phase7.c index 8ac1da07a..f82b60d6d 100644 --- a/scrub/phase7.c +++ b/scrub/phase7.c @@ -7,7 +7,7 @@ #include #include #include -#include "path.h" +#include "libfrog/paths.h" #include "libfrog/ptvar.h" #include "xfs_scrub.h" #include "common.h" diff --git a/scrub/progress.c b/scrub/progress.c index d0afe90a2..c9a9d2863 100644 --- a/scrub/progress.c +++ b/scrub/progress.c @@ -8,7 +8,7 @@ #include #include #include -#include "path.h" +#include "libfrog/paths.h" #include "disk.h" #include "read_verify.h" #include "xfs_scrub.h" diff --git a/scrub/read_verify.c b/scrub/read_verify.c index 828f6be64..2152d1679 100644 --- a/scrub/read_verify.c +++ b/scrub/read_verify.c @@ -9,7 +9,7 @@ #include #include "libfrog/ptvar.h" #include "libfrog/workqueue.h" -#include "path.h" +#include "libfrog/paths.h" #include "xfs_scrub.h" #include "common.h" #include "counter.h" diff --git a/scrub/repair.c b/scrub/repair.c index 45450d8cc..0e5afb200 100644 --- a/scrub/repair.c +++ b/scrub/repair.c @@ -9,7 +9,7 @@ #include #include #include "list.h" -#include "path.h" +#include "libfrog/paths.h" #include "xfs_scrub.h" #include "common.h" #include "scrub.h" diff --git a/scrub/scrub.c b/scrub/scrub.c index 136ed5294..ac67f8ec0 100644 --- a/scrub/scrub.c +++ b/scrub/scrub.c @@ -11,7 +11,7 @@ #include #include #include "list.h" -#include "path.h" +#include "libfrog/paths.h" #include "xfs_scrub.h" #include "common.h" #include "progress.h" diff --git a/scrub/spacemap.c b/scrub/spacemap.c index 774efbaae..a78764788 100644 --- a/scrub/spacemap.c +++ b/scrub/spacemap.c @@ -9,7 +9,7 @@ #include #include #include "libfrog/workqueue.h" -#include "path.h" +#include "libfrog/paths.h" #include "xfs_scrub.h" #include "common.h" #include "spacemap.h" diff --git a/scrub/unicrash.c b/scrub/unicrash.c index 824b10f09..17e8f34f4 100644 --- a/scrub/unicrash.c +++ b/scrub/unicrash.c @@ -13,7 +13,7 @@ #include #include #include -#include "path.h" +#include "libfrog/paths.h" #include "xfs_scrub.h" #include "common.h" #include "unicrash.h" diff --git a/scrub/vfs.c b/scrub/vfs.c index 7d79e7f78..b5d548373 100644 --- a/scrub/vfs.c +++ b/scrub/vfs.c @@ -9,7 +9,7 @@ #include #include #include "handle.h" -#include "path.h" +#include "libfrog/paths.h" #include "libfrog/workqueue.h" #include "xfs_scrub.h" #include "common.h" diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c index 71fc274f5..05478093f 100644 --- a/scrub/xfs_scrub.c +++ b/scrub/xfs_scrub.c @@ -12,7 +12,7 @@ #include #include "platform_defs.h" #include "input.h" -#include "path.h" +#include "libfrog/paths.h" #include "xfs_scrub.h" #include "common.h" #include "unicrash.h" diff --git a/spaceman/file.c b/spaceman/file.c index 34e5f0050..f96a29e53 100644 --- a/spaceman/file.c +++ b/spaceman/file.c @@ -10,7 +10,7 @@ #include "command.h" #include "input.h" #include "init.h" -#include "path.h" +#include "libfrog/paths.h" #include "space.h" #include "libfrog/fsgeom.h" diff --git a/spaceman/freesp.c b/spaceman/freesp.c index 11d0aafbe..034f23406 100644 --- a/spaceman/freesp.c +++ b/spaceman/freesp.c @@ -10,7 +10,7 @@ #include #include "command.h" #include "init.h" -#include "path.h" +#include "libfrog/paths.h" #include "space.h" #include "input.h" diff --git a/spaceman/info.c b/spaceman/info.c index 80442e9a0..f563cf1ed 100644 --- a/spaceman/info.c +++ b/spaceman/info.c @@ -6,7 +6,7 @@ #include "libxfs.h" #include "command.h" #include "init.h" -#include "path.h" +#include "libfrog/paths.h" #include "space.h" #include "libfrog/fsgeom.h" diff --git a/spaceman/init.c b/spaceman/init.c index c845f9205..fa0397abf 100644 --- a/spaceman/init.c +++ b/spaceman/init.c @@ -8,7 +8,7 @@ #include "command.h" #include "input.h" #include "init.h" -#include "path.h" +#include "libfrog/paths.h" #include "space.h" char *progname; diff --git a/spaceman/prealloc.c b/spaceman/prealloc.c index 85dfc9eea..b223010c6 100644 --- a/spaceman/prealloc.c +++ b/spaceman/prealloc.c @@ -8,7 +8,7 @@ #include "command.h" #include "input.h" #include "init.h" -#include "path.h" +#include "libfrog/paths.h" #include "space.h" static cmdinfo_t prealloc_cmd; diff --git a/spaceman/trim.c b/spaceman/trim.c index 88c75a57c..b23e2bf9a 100644 --- a/spaceman/trim.c +++ b/spaceman/trim.c @@ -7,7 +7,7 @@ #include "libxfs.h" #include "command.h" #include "init.h" -#include "path.h" +#include "libfrog/paths.h" #include "space.h" #include "input.h"