diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2019-09-09 15:37:07 -0400 |
|---|---|---|
| committer | Eric Sandeen <sandeen@redhat.com> | 2019-09-09 15:37:07 -0400 |
| commit | 660b5d9692691e384119dd11a8d60a900ef7b542 (patch) | |
| tree | 5d1e9f23374a194292c5c71a280c0b1e7a551036 | |
| parent | 59f1f2a6e01da728a7491c6309763858d10b3ea8 (diff) | |
| download | xfsprogs-dev-660b5d9692691e384119dd11a8d60a900ef7b542.tar.gz | |
libfrog: move libfrog.h to libfrog/util.h
Move this header to libfrog since the code is there already.
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>
| -rw-r--r-- | libfrog/fsgeom.c | 2 | ||||
| -rw-r--r-- | libfrog/util.c | 2 | ||||
| -rw-r--r-- | libfrog/util.h (renamed from include/libfrog.h) | 6 | ||||
| -rw-r--r-- | mkfs/xfs_mkfs.c | 2 | ||||
| -rw-r--r-- | repair/sb.c | 2 | ||||
| -rw-r--r-- | scrub/disk.c | 2 | ||||
| -rw-r--r-- | scrub/phase1.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/libfrog/fsgeom.c b/libfrog/fsgeom.c index 9a428bf6a9..bc872834d1 100644 --- a/libfrog/fsgeom.c +++ b/libfrog/fsgeom.c @@ -4,7 +4,7 @@ */ #include "libxfs.h" #include "fsgeom.h" -#include "libfrog.h" +#include "util.h" void xfs_report_geom( diff --git a/libfrog/util.c b/libfrog/util.c index ff935184c7..8fb10cf82f 100644 --- a/libfrog/util.c +++ b/libfrog/util.c @@ -4,7 +4,7 @@ * All Rights Reserved. */ #include "platform_defs.h" -#include "libfrog.h" +#include "util.h" /* * libfrog is a collection of miscellaneous userspace utilities. diff --git a/include/libfrog.h b/libfrog/util.h index d33f014689..1b97881bf1 100644 --- a/include/libfrog.h +++ b/libfrog/util.h @@ -3,9 +3,9 @@ * Copyright (c) 2000-2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#ifndef __LIBFROG_UTIL_H_ -#define __LIBFROG_UTIL_H_ +#ifndef __LIBFROG_UTIL_H__ +#define __LIBFROG_UTIL_H__ unsigned int log2_roundup(unsigned int i); -#endif /* __LIBFROG_UTIL_H_ */ +#endif /* __LIBFROG_UTIL_H__ */ diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index 50913866ba..6254fd426a 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -3,7 +3,7 @@ * Copyright (c) 2000-2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "libfrog.h" +#include "libfrog/util.h" #include "libxfs.h" #include <ctype.h> #include "xfs_multidisk.h" diff --git a/repair/sb.c b/repair/sb.c index 3955dfba2b..91a36dd34f 100644 --- a/repair/sb.c +++ b/repair/sb.c @@ -3,7 +3,7 @@ * Copyright (c) 2000-2003,2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "libfrog.h" +#include "libfrog/util.h" #include "libxfs.h" #include "libxcmd.h" #include "libxlog.h" diff --git a/scrub/disk.c b/scrub/disk.c index 91e13140bb..dcdd5ba83e 100644 --- a/scrub/disk.c +++ b/scrub/disk.c @@ -17,7 +17,7 @@ # include <linux/hdreg.h> #endif #include "platform_defs.h" -#include "libfrog.h" +#include "libfrog/util.h" #include "libfrog/paths.h" #include "xfs_scrub.h" #include "common.h" diff --git a/scrub/phase1.c b/scrub/phase1.c index d123c41999..3211a488a5 100644 --- a/scrub/phase1.c +++ b/scrub/phase1.c @@ -13,7 +13,7 @@ #include <dirent.h> #include <stdint.h> #include <pthread.h> -#include "libfrog.h" +#include "libfrog/util.h" #include "libfrog/workqueue.h" #include "input.h" #include "libfrog/paths.h" |