From 26799ad1e58dc5a7539bde822bc93a0a7acba97d Mon Sep 17 00:00:00 2001 From: Richard Basch Date: Wed, 19 Feb 1997 02:06:04 +0000 Subject: [PATCH] Renamed getst() to getstr() to avoid conflicts with krb4.h definition git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9912 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kadmin/ktutil/ktutil_funcs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/kadmin/ktutil/ktutil_funcs.c b/src/kadmin/ktutil/ktutil_funcs.c index 64b7272fc..8429169f3 100644 --- a/src/kadmin/ktutil/ktutil_funcs.c +++ b/src/kadmin/ktutil/ktutil_funcs.c @@ -182,16 +182,16 @@ krb5_error_code ktutil_write_keytab(context, list, name) #ifdef KRB5_KRB4_COMPAT /* - * getst() takes a file pointer, a string and a count. It reads from + * getstr() takes a file pointer, a string and a count. It reads from * the file until either it has read "count" characters, or until it * reads a null byte. When finished, what has been read exists in the * given string "s". If "count" characters were actually read, the * last is changed to a null, so the returned string is always null- - * terminated. getst() returns the number of characters read, + * terminated. getstr() returns the number of characters read, * including the null terminator. */ -int getst(fp, s, n) +int getstr(fp, s, n) FILE *fp; register char *s; int n; @@ -241,9 +241,9 @@ krb5_error_code ktutil_read_srvtab(context, name, list) memset(sname, 0, sizeof (sname)); memset(sinst, 0, sizeof (sinst)); memset(srealm, 0, sizeof (srealm)); - if (!(getst(fp, sname, SNAME_SZ) > 0 && - getst(fp, sinst, INST_SZ) > 0 && - getst(fp, srealm, REALM_SZ) > 0 && + if (!(getstr(fp, sname, SNAME_SZ) > 0 && + getstr(fp, sinst, INST_SZ) > 0 && + getstr(fp, srealm, REALM_SZ) > 0 && fread(&kvno, 1, 1, fp) > 0 && fread((char *)key, sizeof (key), 1, fp) > 0)) break; -- 2.26.2