summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarel Zak2013-09-10 13:11:02 +0200
committerKarel Zak2013-09-10 13:11:02 +0200
commit60f25deae7714a4c67fbabc3b2b0c78bf8dc035e (patch)
tree8f18839bb863804cd6a64c35b1aa1bd6c9c621d8
parenthexdump: revert global exitval variable change (diff)
downloadkernel-qcow2-util-linux-60f25deae7714a4c67fbabc3b2b0c78bf8dc035e.tar.gz
kernel-qcow2-util-linux-60f25deae7714a4c67fbabc3b2b0c78bf8dc035e.tar.xz
kernel-qcow2-util-linux-60f25deae7714a4c67fbabc3b2b0c78bf8dc035e.zip
lib: rename time-util.c to timeutils.c, fix headers
Signed-off-by: Karel Zak <kzak@redhat.com>
-rw-r--r--include/Makemodule.am2
-rw-r--r--include/timeutils.h (renamed from include/time-util.h)0
-rw-r--r--lib/Makemodule.am2
-rw-r--r--lib/timeutils.c (renamed from lib/time-util.c)3
-rw-r--r--libmount/src/lock.c1
-rw-r--r--login-utils/last.c2
6 files changed, 6 insertions, 4 deletions
diff --git a/include/Makemodule.am b/include/Makemodule.am
index 33276e15f..62a8978da 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
index bcae6137c..bcae6137c 100644
--- a/include/time-util.h
+++ b/include/timeutils.h
diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index 32d46ba1f..fee9444e8 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
index e027bac75..7fe62187d 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 82086da24..d9b6f5939 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 bc1b4ce0d..6bec57d17 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