summaryrefslogtreecommitdiffstats
path: root/src/kadmin/cli
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2001-10-10 03:18:22 +0000
committerKen Raeburn <raeburn@mit.edu>2001-10-10 03:18:22 +0000
commit7613acc70e37ebabd7743da02da4f4ff0d218d5c (patch)
treeea7b08ad73cfb7cd8a5ca8e77a9fb646770804f0 /src/kadmin/cli
parentad4d9f8d0f83524931da62aebb592ab53f2218d9 (diff)
downloadkrb5-7613acc70e37ebabd7743da02da4f4ff0d218d5c.tar.gz
krb5-7613acc70e37ebabd7743da02da4f4ff0d218d5c.tar.xz
krb5-7613acc70e37ebabd7743da02da4f4ff0d218d5c.zip
Don't conditionalize prototypes; delete macros supporting it. (Maybe overdone;
don't worry about restoring them when importing new versions of code.) git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13792 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/cli')
-rw-r--r--src/kadmin/cli/ChangeLog4
-rw-r--r--src/kadmin/cli/dump.c12
2 files changed, 10 insertions, 6 deletions
diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog
index 39e2f6c83b..cbc4093c2f 100644
--- a/src/kadmin/cli/ChangeLog
+++ b/src/kadmin/cli/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09 Ken Raeburn <raeburn@mit.edu>
+
+ * dump.c: Make prototypes unconditional.
+
2001-06-26 Ezra Peisach <epeisach@mit.edu>
* getdate.y: Provide full prototype for getdate_yylex() and
diff --git a/src/kadmin/cli/dump.c b/src/kadmin/cli/dump.c
index 162e35d9c6..1896e21849 100644
--- a/src/kadmin/cli/dump.c
+++ b/src/kadmin/cli/dump.c
@@ -433,10 +433,10 @@ void dump_db(argc, argv)
char *programname;
char *ofile;
krb5_error_code kret;
- krb5_error_code (*dump_iterator) PROTOTYPE((krb5_pointer,
- char *,
- kadm5_principal_ent_rec *));
- krb5_error_code (*dump_header) PROTOTYPE((struct dump_args *));
+ krb5_error_code (*dump_iterator) (krb5_pointer,
+ char *,
+ kadm5_principal_ent_rec *);
+ krb5_error_code (*dump_header) (struct dump_args *);
const char * dump_name;
int aindex, num, i;
krb5_boolean locked;
@@ -1329,11 +1329,11 @@ load_db(argc, argv)
const char *dumpfile;
char *dbname;
char *dbname_tmp;
- int (*restore_function) PROTOTYPE((const char *,
+ int (*restore_function) (const char *,
krb5_context,
const char *,
FILE *,
- int));
+ int);
const char * restore_name;
int update, verbose;
krb5_int32 crflags;