From: Karel Zak <kzak@redhat.com>
Date: Tue, 10 Sep 2013 11:11:02 +0000 (+0200)
Subject: lib: rename time-util.c to timeutils.c, fix headers
X-Git-Tag: v2.24-rc1~291
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60f25deae7714a4c67fbabc3b2b0c78bf8dc035e;p=thirdparty%2Futil-linux.git

lib: rename time-util.c to timeutils.c, fix headers

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/include/Makemodule.am b/include/Makemodule.am
index 33276e15f0..62a8978da8 100644
--- a/include/Makemodule.am
+++ b/include/Makemodule.am
@@ -40,7 +40,7 @@ dist_noinst_HEADERS += \
 	include/swapheader.h \
 	include/sysfs.h \
 	include/timer.h \
-	include/time-util.h
+	include/timeutils.h
 	include/tt.h \
 	include/ttyutils.h \
 	include/wholedisk.h \
diff --git a/include/time-util.h b/include/timeutils.h
similarity index 100%
rename from include/time-util.h
rename to include/timeutils.h
diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index 32d46ba1f8..fee9444e80 100644
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -23,7 +23,7 @@ libcommon_la_SOURCES = \
 	lib/sysfs.c \
 	lib/tt.c \
 	lib/wholedisk.c \
-	lib/time-util.c \
+	lib/timeutils.c \
 	lib/ttyutils.c \
 	lib/xgetpass.c \
 	lib/exec_shell.c
diff --git a/lib/time-util.c b/lib/timeutils.c
similarity index 99%
rename from lib/time-util.c
rename to lib/timeutils.c
index e027bac75c..7fe62187df 100644
--- a/lib/time-util.c
+++ b/lib/timeutils.c
@@ -24,7 +24,8 @@
 #include <time.h>
 
 #include "c.h"
-#include "time-util.h"
+#include "strutils.h"
+#include "timeutils.h"
 
 #define WHITESPACE " \t\n\r"
 
diff --git a/libmount/src/lock.c b/libmount/src/lock.c
index 82086da249..d9b6f59395 100644
--- a/libmount/src/lock.c
+++ b/libmount/src/lock.c
@@ -21,6 +21,7 @@
 #include <limits.h>
 #include <sys/file.h>
 
+#include "strutils.h"
 #include "closestream.h"
 #include "pathnames.h"
 #include "mountP.h"
diff --git a/login-utils/last.c b/login-utils/last.c
index bc1b4ce0d9..6bec57d172 100644
--- a/login-utils/last.c
+++ b/login-utils/last.c
@@ -48,7 +48,7 @@
 #include "closestream.h"
 #include "carefulputc.h"
 #include "strutils.h"
-#include "time-util.h"
+#include "timeutils.h"
 
 #if defined(_HAVE_UT_TV)
 # define UL_UT_TIME ut_tv.tv_sec