From c227a07bd8971535bfea2234cc67096cda9666a7 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Thu, 24 Jul 1997 11:30:28 +0000
Subject: [PATCH] renamed parse_time

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2618 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 admin/load.c  | 16 ++++++++--------
 kadmin/load.c | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/admin/load.c b/admin/load.c
index 5ce188fc3..af851c00e 100644
--- a/admin/load.c
+++ b/admin/load.c
@@ -63,8 +63,8 @@ skip_next(char *p)
     return p;
 }
 
-time_t*
-parse_time(time_t *t, char *s)
+static time_t*
+parse_time_string(time_t *t, char *s)
 {
     int year, month, date, hour, minute, second;
     struct tm tm;
@@ -157,7 +157,7 @@ parse_event(Event *ev, char *str)
 	ev = malloc(sizeof(*ev));
     memset(ev, 0, sizeof(*ev));
     p = strsep(&str, ":");
-    parse_time(&ev->time, p);
+    parse_time_string(&ev->time, p);
     p = strsep(&str, ":");
     krb5_parse_name(context, p, &ev->principal);
     return ev;
@@ -271,9 +271,9 @@ doit(char *filename, int merge)
 	
 	parse_event(&ent.created_by, e.created);
 	ent.modified_by = parse_event(NULL, e.modified);
-	ent.valid_start = parse_time(NULL, e.valid_start);
-	ent.valid_end = parse_time(NULL, e.valid_end);
-	ent.pw_end = parse_time(NULL, e.pw_end);
+	ent.valid_start = parse_time_string(NULL, e.valid_start);
+	ent.valid_end = parse_time_string(NULL, e.valid_end);
+	ent.pw_end = parse_time_string(NULL, e.pw_end);
 	ent.max_life = parse_integer(NULL, e.max_life);
 	ent.max_renew = parse_integer(NULL, e.max_renew);
 	
@@ -290,7 +290,7 @@ load(int argc, char **argv)
 {
     if(argc < 2){
 	fprintf(stderr, "Usage: load filename\n");
-	return;
+	return 0;
     }
     doit(argv[1], 0);
     return 0;
@@ -301,7 +301,7 @@ merge(int argc, char **argv)
 {
     if(argc < 2){
 	fprintf(stderr, "Usage: merge filename\n");
-	return;
+	return 0;
     }
     doit(argv[1], 1);
     return 0;
diff --git a/kadmin/load.c b/kadmin/load.c
index 5ce188fc3..af851c00e 100644
--- a/kadmin/load.c
+++ b/kadmin/load.c
@@ -63,8 +63,8 @@ skip_next(char *p)
     return p;
 }
 
-time_t*
-parse_time(time_t *t, char *s)
+static time_t*
+parse_time_string(time_t *t, char *s)
 {
     int year, month, date, hour, minute, second;
     struct tm tm;
@@ -157,7 +157,7 @@ parse_event(Event *ev, char *str)
 	ev = malloc(sizeof(*ev));
     memset(ev, 0, sizeof(*ev));
     p = strsep(&str, ":");
-    parse_time(&ev->time, p);
+    parse_time_string(&ev->time, p);
     p = strsep(&str, ":");
     krb5_parse_name(context, p, &ev->principal);
     return ev;
@@ -271,9 +271,9 @@ doit(char *filename, int merge)
 	
 	parse_event(&ent.created_by, e.created);
 	ent.modified_by = parse_event(NULL, e.modified);
-	ent.valid_start = parse_time(NULL, e.valid_start);
-	ent.valid_end = parse_time(NULL, e.valid_end);
-	ent.pw_end = parse_time(NULL, e.pw_end);
+	ent.valid_start = parse_time_string(NULL, e.valid_start);
+	ent.valid_end = parse_time_string(NULL, e.valid_end);
+	ent.pw_end = parse_time_string(NULL, e.pw_end);
 	ent.max_life = parse_integer(NULL, e.max_life);
 	ent.max_renew = parse_integer(NULL, e.max_renew);
 	
@@ -290,7 +290,7 @@ load(int argc, char **argv)
 {
     if(argc < 2){
 	fprintf(stderr, "Usage: load filename\n");
-	return;
+	return 0;
     }
     doit(argv[1], 0);
     return 0;
@@ -301,7 +301,7 @@ merge(int argc, char **argv)
 {
     if(argc < 2){
 	fprintf(stderr, "Usage: merge filename\n");
-	return;
+	return 0;
     }
     doit(argv[1], 1);
     return 0;