oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

renamed parse_time

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2618 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-07-24 11:30:28 +00:00
parent 0e9bc9ad93
commit c227a07bd8
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
admin/load.c
View File

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

16
kadmin/load.c
View File

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