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>

diff --git a/libfrog/fsgeom.c b/libfrog/fsgeom.c
index 9a428bf6a9f36136d304807a8359adb8073592a3..bc872834d11672ca171afa17ab74a9e91f7f0d0f 100644 (file)
--- 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 ff935184c7c734bf8e09abb9495863f09302cc0d..8fb10cf82f5ca4fa0f382df3a84a4c4c06624bce 100644 (file)
--- 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
similarity index 65%
rename from include/libfrog.h
rename to libfrog/util.h
index d33f014689641f2cb597fde46628f28248c0fd6d..1b97881bf1687c351aba142b3e9293825c5a752e 100644 (file)
--- 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 50913866ba4e27b938535b5d9432fb0caf66974e..6254fd426a06275e0947a036745131420151b389 100644 (file)
--- 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 3955dfba2ba21ccf12155ded9d6d2f42f7661e77..91a36dd34f1bf03fde37800f0f5be77ab0882eda 100644 (file)
--- 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 91e13140bb7a8889e5f18a202f65a29d29353063..dcdd5ba83ed87836fb83e428fbf34333eaebec34 100644 (file)
--- 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 d123c41999115bd5e4c6b898d4100097b78698ba..3211a488a5d58c08b96b2e37f0af7f2705e177be 100644 (file)
--- 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"