* nstrtok.h: New file with prototype for nstrtok

        * ovload.c: Include nstrtok.h

        * strtok.c: Include nstrtok.h for prototype. Declare delim as
        const char * argument. Delete rcsid.

        * string_table.c: Delete rcsid.

        * kadm5_create.c (build_name_with_realm): Declare static.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13536 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index 66947de1e9ca51522ba7b92c5df373edfb764640..3e265b50337e8e2ef805db40a57faa8cfcbc418e 100644 (file)
--- a/src/kadmin/dbutil/ChangeLog
+++ b/src/kadmin/dbutil/ChangeLog
@@ -1,3 +1,16 @@
+2001-06-29  Ezra Peisach  <epeisach@mit.edu>
+
+       * nstrtok.h: New file with prototype for nstrtok.
+
+       * ovload.c: Include nstrtok.h
+
+       * strtok.c: Include nstrtok.h for prototype. Declare delim as
+       const char * argument. Delete rcsid. 
+
+       * string_table.c: Delete rcsid.
+
+       * kadm5_create.c (build_name_with_realm): Declare static.
+
 2001-06-21  Ezra Peisach  <epeisach@mit.edu>
 
        * kdb5_util.c (main): Change optarg to koptarg to prevent

diff --git a/src/kadmin/dbutil/kadm5_create.c b/src/kadmin/dbutil/kadm5_create.c
index d4f326a39f4a41d75f7655001335525fdc67f356..146010c3768d29e81c578dbb42ce521043120b23 100644 (file)
--- a/src/kadmin/dbutil/kadm5_create.c
+++ b/src/kadmin/dbutil/kadm5_create.c
@@ -1,7 +1,6 @@
 /*
  * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved.
  *
- * $Id$
  * $Source$
  */
 
@@ -31,10 +30,6 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#if !defined(lint) && !defined(__CODECENTER__)
-static char *rcsid = "$Header$";
-#endif
-
 #include "string_table.h"
 
 #include <stdio.h>
@@ -146,7 +141,7 @@ int kadm5_create_magic_princs(kadm5_config_params *params,
  *
  * Requires: both strings are null-terminated
  */
-char *build_name_with_realm(char *name, char *realm)
+static char *build_name_with_realm(char *name, char *realm)
 {
      char *n;
 

diff --git a/src/kadmin/dbutil/nstrtok.h b/src/kadmin/dbutil/nstrtok.h
new file mode 100644 (file)
index 0000000..f7f0d4a
--- /dev/null
+++ b/src/kadmin/dbutil/nstrtok.h
@@ -0,0 +1,3 @@
+/* Prototype for nstrtok */
+char *nstrtok(char *, const char *delim);
+

diff --git a/src/kadmin/dbutil/ovload.c b/src/kadmin/dbutil/ovload.c
index 350dfb6941d334cc4244a1d5fd4e3e49ee9f15a3..15978f8a37fead1e994fc8ba11b077bc0933bc94 100644 (file)
--- a/src/kadmin/dbutil/ovload.c
+++ b/src/kadmin/dbutil/ovload.c
@@ -8,8 +8,7 @@
 #include    <kadm5/adb.h>
 #include    "import_err.h"
 #include    "kdb5_util.h"
-
-char *nstrtok();
+#include    "nstrtok.h"
 
 #define LINESIZE       32768 /* XXX */
 #define PLURAL(count)  (((count) == 1) ? error_message(IMPORT_SINGLE_RECORD) : error_message(IMPORT_PLURAL_RECORDS))

diff --git a/src/kadmin/dbutil/string_table.c b/src/kadmin/dbutil/string_table.c
index c5f09f83b693845dd0a5e90a779a952fc8367669..fcf65dcfc355f7912a73dc4a820ef95ef4ff21f8 100644 (file)
--- a/src/kadmin/dbutil/string_table.c
+++ b/src/kadmin/dbutil/string_table.c
@@ -1,13 +1,8 @@
 /*
  * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved.
  * 
- * $Header$
  */
 
-#if !defined(lint) && !defined(__CODECENTER__)
-static char *rcsid = "$Header$";
-#endif
-
 /* String table of messages for kadm5_create */
 
 char *str_INITING_KCONTEXT = "while initializing the kerberos context";

diff --git a/src/kadmin/dbutil/strtok.c b/src/kadmin/dbutil/strtok.c
index 4458e0c0b86bde061391facc07bf1c0702bbdf8c..80117a31b64be6a020a5498b61fdd725891e3f5f 100644 (file)
--- a/src/kadmin/dbutil/strtok.c
+++ b/src/kadmin/dbutil/strtok.c
@@ -1,26 +1,8 @@
 /*
  * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved
  *
- * $Header$
- * 
- * $Log$
- * Revision 1.1  1996/08/01 18:39:54  bjaspan
- *     * Makefile.in, Makefile.ov, configure.in, dump.c: add support for
- *         dump/load of OV*Secure-compatible format.
- *
- * Revision 1.1.2.1  1996/06/20  21:49:01  marc
- * File added to the repository on a branch
- *
- * Revision 1.1  1993/11/14  23:51:23  shanzer
- * Initial revision
- *
  */
 
-#if !defined(lint) && !defined(__CODECENTER__)
-static char *rcsid = "$Header$";
-#endif
-
-
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -40,12 +22,9 @@ static char *rcsid = "$Header$";
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtok.c   5.7 (Berkeley) 6/1/90";
-#endif /* LIBC_SCCS and not lint */
-
 #include <stddef.h>
 #include <string.h>
+#include "nstrtok.h"
 
 /*
  * Function: nstrtok
@@ -71,9 +50,10 @@ static char sccsid[] = "@(#)strtok.c 5.7 (Berkeley) 6/1/90";
 
 char *
 nstrtok(s, delim)
-       register char *s, *delim;
+       register char *s;
+       register const char *delim;
 {
-       register char *spanp;
+       register const char *spanp;
        register int c, sc;
        char *tok;
        static char *last;