summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnand Avati <avati@redhat.com>2014-03-27 08:03:52 -0700
committerAnand Avati <avati@redhat.com>2014-04-20 18:07:44 -0700
commit11473a6a10aaa5e62050e7e52115e2f8f10de124 (patch)
tree83859e3e12a2030e486ff6ec029eafdceafc0889
parent81b32ab6e1c950577d0f2779db67283303e3e705 (diff)
common-utils: new dirent compatible time fmt
Introduce a new time format without "/" and spaces, in order to be used in (virtual) filenames. Change-Id: I468be54f1ec7f45265add4c458e19d95567439f7 BUG: 1089216 Signed-off-by: Anand Avati <avati@redhat.com> Reviewed-on: http://review.gluster.org/7507 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
-rw-r--r--libglusterfs/src/common-utils.c6
-rw-r--r--libglusterfs/src/common-utils.h1
-rw-r--r--libglusterfs/src/graph.c2
3 files changed, 6 insertions, 3 deletions
diff --git a/libglusterfs/src/common-utils.c b/libglusterfs/src/common-utils.c
index bfc2fc6..80d9d29 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -2300,14 +2300,16 @@ static const char *__gf_timefmts[] = {
"%F %T",
"%Y/%m/%d-%T",
"%b %d %T",
- "%F %H%M%S"
+ "%F %H%M%S",
+ "%Y-%m-%d-%T",
};
static const char *__gf_zerotimes[] = {
"0000-00-00 00:00:00",
"0000/00/00-00:00:00",
"xxx 00 00:00:00",
- "0000-00-00 000000"
+ "0000-00-00 000000",
+ "0000-00-00-00:00:00",
};
void
diff --git a/libglusterfs/src/common-utils.h b/libglusterfs/src/common-utils.h
index 26dcd31..e17029d 100644
--- a/libglusterfs/src/common-utils.h
+++ b/libglusterfs/src/common-utils.h
@@ -480,6 +480,7 @@ typedef enum {
gf_timefmt_Ymd_T, /* YYYY/MM-DD-hh:mm:ss */
gf_timefmt_bdT, /* ddd DD hh:mm:ss */
gf_timefmt_F_HMS, /* YYYY-MM-DD hhmmss */
+ gf_timefmt_dirent,
gf_timefmt_last
} gf_timefmts;
diff --git a/libglusterfs/src/graph.c b/libglusterfs/src/graph.c
index e76df1c..b4eddd8 100644
--- a/libglusterfs/src/graph.c
+++ b/libglusterfs/src/graph.c
@@ -367,7 +367,7 @@ fill_uuid (char *uuid, int size)
strerror (errno));
}
- gf_time_fmt (now_str, sizeof now_str, tv.tv_sec, gf_timefmt_Ymd_T);
+ gf_time_fmt (now_str, sizeof now_str, tv.tv_sec, gf_timefmt_dirent);
snprintf (uuid, size, "%s-%d-%s:%"GF_PRI_SUSECONDS,
hostname, getpid(), now_str, tv.tv_usec);