converted to K&R style *by hand*. <sigh>

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

diff --git a/src/lib/krb5/ccache/file/fcc_close.c b/src/lib/krb5/ccache/file/fcc_close.c
index 9f9ec52deb254c71d3173b13655ebfb5f0c4a386..35342b6fcaeac014b99112258e32d01b05676140 100644 (file)
--- a/src/lib/krb5/ccache/file/fcc_close.c
+++ b/src/lib/krb5/ccache/file/fcc_close.c
@@ -16,6 +16,8 @@ static char fcc_resolve_c[] = "$Id$";
 
 #include <krb5/copyright.h>
 
+#include "fcc.h"
+
 /*
  * Modifies:
  * id
@@ -29,7 +31,8 @@ static char fcc_resolve_c[] = "$Id$";
  * permission errors
  */
 krb5_error
-krb5_fcc_close(krb5_ccache id)
+krb5_fcc_close(id)
+   krb5_ccache id;
 {
      int ret;
 

diff --git a/src/lib/krb5/ccache/file/fcc_defnam.c b/src/lib/krb5/ccache/file/fcc_defnam.c
index 01bb2eb473290269a06f904ca72f06201a0ce91f..c03fc3f5e8d814be64890907a8abdb8e02adf623 100644 (file)
--- a/src/lib/krb5/ccache/file/fcc_defnam.c
+++ b/src/lib/krb5/ccache/file/fcc_defnam.c
@@ -39,7 +39,7 @@ static char krb5_default_name_string[KRB5_FCC_MAXLEN] = "";
  */
 
 char *
-krb5_fcc_default_name (void)
+krb5_fcc_default_name ()
 {
      char *krb5ccache;
      int len;

diff --git a/src/lib/krb5/ccache/file/fcc_destry.c b/src/lib/krb5/ccache/file/fcc_destry.c
index c557054b13dab83e7ca54551f49c0b9565a9c23e..7b8fd1c9603f6f87aa160263164c950f11f5500a 100644 (file)
--- a/src/lib/krb5/ccache/file/fcc_destry.c
+++ b/src/lib/krb5/ccache/file/fcc_destry.c
@@ -24,7 +24,8 @@ static char fcc_destry_c[] = "$Id$";
  * system errors
  */
 krb5_error
-krb5_fcc_destroy(krb5_ccache id)
+krb5_fcc_destroy(id)
+   krb5_ccache id;
 {
      struct stat buf;
      unsigned long size;

diff --git a/src/lib/krb5/ccache/file/fcc_eseq.c b/src/lib/krb5/ccache/file/fcc_eseq.c
index 9760e59e6a122acf61d7f75bf9e0ac494f28d472..a2af57ad170161f5c46e5461358e3e5131225fd2 100644 (file)
--- a/src/lib/krb5/ccache/file/fcc_eseq.c
+++ b/src/lib/krb5/ccache/file/fcc_eseq.c
@@ -30,7 +30,9 @@ static char fcc_eseq_c[] = "$Id$";
  * and invalidates the cursor (it must never be used after this call).
  */
 krb5_error
-krb5_fcc_end_seq_get(krb5_ccache id, krb5_cc_cursor *cursor)
+krb5_fcc_end_seq_get(id, cursor)
+   krb5_ccache id;
+   krb5_cc_cursor *cursor;
 {
 #ifdef OPENCLOSE
 #else

diff --git a/src/lib/krb5/ccache/file/fcc_gennew.c b/src/lib/krb5/ccache/file/fcc_gennew.c
index f2986b55833a59f66a9ecfbbfcd4a1d274288d5e..4f69282bc902ef0fd6f84e40ad157c65e1349213 100644 (file)
--- a/src/lib/krb5/ccache/file/fcc_gennew.c
+++ b/src/lib/krb5/ccache/file/fcc_gennew.c
@@ -32,7 +32,8 @@ static char fcc_resolve_c[] = "$Id$";
  *             krb5_ccache.  id is undefined.
  */
 krb5_err
-krb5_fcc_generate_new (krb5_ccache id)
+krb5_fcc_generate_new (id)
+   krb5_ccache id;
 {
      char scratch[100];  /* XXX Is this large enough */
      

diff --git a/src/lib/krb5/ccache/file/fcc_getnam.c b/src/lib/krb5/ccache/file/fcc_getnam.c
index 9c1999b7dd87d73627ea83b2eff74e28c552daf4..6b6fa05ec23b8c39862f26da79f280ac3c145c6d 100644 (file)
--- a/src/lib/krb5/ccache/file/fcc_getnam.c
+++ b/src/lib/krb5/ccache/file/fcc_getnam.c
@@ -26,7 +26,8 @@ static char fcc_resolve_c[] = "$Id$";
  * The name of the file cred cache id.
  */
 char *
-krb5_fcc_get_name (krb5_ccache id)
+krb5_fcc_get_name (id)
+   krb5_ccache id;
 {
      return (char *) id->data->filename;
 }

diff --git a/src/lib/krb5/ccache/file/fcc_gprin.c b/src/lib/krb5/ccache/file/fcc_gprin.c
index 31b0e14d6baee35b1cdeb18f99bc22e0c1748419..54244b3936ce542a77f615e810ccd62eb3518b8e 100644 (file)
--- a/src/lib/krb5/ccache/file/fcc_gprin.c
+++ b/src/lib/krb5/ccache/file/fcc_gprin.c
@@ -30,7 +30,9 @@ static char fcc_gprinc_c[] = "$Id$";
  * KRB5_NOMEM
  */
 krb5_error
-krb5_fcc_get_principal(krb5_ccache id, krb5_principal *princ)
+krb5_fcc_get_principal(id, princ)
+   krb5_ccache id;
+   krb5_principal *princ;
 {
 #ifdef OPENCLOSE
      id->data->fd = open(id->data->filename, O_RDONLY, 0);

diff --git a/src/lib/krb5/ccache/file/fcc_init.c b/src/lib/krb5/ccache/file/fcc_init.c
index 3b1f0b12e4619a7d075104fdc8a91e128d1d8684..61c840e8a1545504b06122cd9555eef970b69e7a 100644 (file)
--- a/src/lib/krb5/ccache/file/fcc_init.c
+++ b/src/lib/krb5/ccache/file/fcc_init.c
@@ -31,7 +31,9 @@ static char fcc_resolve_c[] = "$Id$";
  * permission errors
  */
 krb5_error
-krb5_fcc_initialize(krb5_ccache id, krb5_principal princ)
+krb5_fcc_initialize(id, princ)
+   krb5_ccache id;
+   krb5_principal princ;
 {
      int ret;
 

diff --git a/src/lib/krb5/ccache/file/fcc_nseq.c b/src/lib/krb5/ccache/file/fcc_nseq.c
index cd17aa901db3c6cdf4418ff149b71c97f8635ff3..e51957016f16abcf87c50e8a7e28aa037f96e0d2 100644 (file)
--- a/src/lib/krb5/ccache/file/fcc_nseq.c
+++ b/src/lib/krb5/ccache/file/fcc_nseq.c
@@ -38,7 +38,10 @@ static char fcc_nseq_c[] = "$Id$";
  * system errors
  */
 krb5_error
-krb5_fcc_next_cred(krb5_ccache id, krb5_creds *creds, krb5_cc_cursor *cursor)
+krb5_fcc_next_cred(id, creds, cursor)
+   krb5_ccache id;
+   krb5_creds *creds;
+   krb5_cc_cursor *cursor;
 {
      int ret;
      krb5_error kret;

diff --git a/src/lib/krb5/ccache/file/fcc_read.c b/src/lib/krb5/ccache/file/fcc_read.c
index 679347d1281222a042109737d1df59922f454e24..70a3d31bb47e817d3fe01f53c3fd452e6acf7f9b 100644 (file)
--- a/src/lib/krb5/ccache/file/fcc_read.c
+++ b/src/lib/krb5/ccache/file/fcc_read.c
@@ -36,7 +36,9 @@ static char fcc_read_c[] = "$Id$";
  */
 
 krb5_error
-krb5_fcc_read_principal(krb5_ccache id, krb5_principal princ)
+krb5_fcc_read_principal(id, princ)
+   krb5_ccache id;
+   krb5_principal princ;
 {
      krb5_error kret;
      krb5_int32 length;
@@ -58,7 +60,9 @@ krb5_fcc_read_principal(krb5_ccache id, krb5_principal princ)
 }
 
 krb5_error
-krb5_fcc_read_keyblock(krb5_ccache id, krb5_keyblock *keyblock)
+krb5_fcc_read_keyblock(id, keyblock)
+   krb5_ccache id;
+   krb5_keyblock *keyblock;
 {
      krb5_error kret;
      int ret;
@@ -76,7 +80,9 @@ krb5_fcc_read_keyblock(krb5_ccache id, krb5_keyblock *keyblock)
 }
 
 krb5_error
-krb5_fcc_read_data(krb5_ccache id, krb5_data *data)
+krb5_fcc_read_data(id, data)
+   krb5_ccache id;
+   krb5_data *data;
 {
      krb5_error kret;
      int ret;
@@ -101,31 +107,41 @@ krb5_fcc_read_data(krb5_ccache id, krb5_data *data)
 }
 
 krb5_error
-krb5_fcc_read_int32(krb5_ccache id, krb5_int32 *i)
+krb5_fcc_read_int32(id, i)
+   krb5_ccache id;
+   krb5_int32 *i;
 {
      return krb5_fcc_read(id, i, sizeof(krb5_int32));
 }
 
 krb5_error
-krb5_fcc_read_keytype(krb5_ccache id, krb5_keytype *k)
+krb5_fcc_read_keytype(id, k)
+   krb5_ccache id;
+   krb5_keytype *k;
 {
      return krb5_fcc_read(id, k, sizeof(krb5_keytype));
 }
 
 krb5_error
-krb5_fcc_read_int(krb5_ccache id, int *i)
+krb5_fcc_read_int(id, i)
+   krb5_ccache id;
+   int *i;
 {
      return krb5_fcc_read(id, i, sizeof(int));
 }
 
 krb5_error
-krb5_fcc_read_bool(krb5_ccache id, krb5_boolean *b)
+krb5_fcc_read_bool(id, b)
+   krb5_ccache id;
+   krb5_boolean *b;
 {
      return krb5_fcc_read(id, b, sizeof(krb5_boolean));
 }
 
 krb5_error
-krb5_fcc_read_times(krb5_ccache id, krb5_ticket_times *t)
+krb5_fcc_read_times(id, t)
+   krb5_ccache id;
+   krb5_ticket_times *t;
 {
      return krb5_fcc_read(id, t, sizeof(krb5_ticket_times));
 }

diff --git a/src/lib/krb5/ccache/file/fcc_reslv.c b/src/lib/krb5/ccache/file/fcc_reslv.c
index febddf89d7e7bc1a1f325aca26956fe9be3adb16..3dda640550a393ad5600d16f6092af33a2df4cfd 100644 (file)
--- a/src/lib/krb5/ccache/file/fcc_reslv.c
+++ b/src/lib/krb5/ccache/file/fcc_reslv.c
@@ -40,7 +40,9 @@ extern struct krb5_cc_ops krb5_fcc_ops;
  * permission errors
  */
 krb5_error
-krb5_fcc_resolve (krb5_ccache id, char *residual)
+krb5_fcc_resolve (id, residual)
+   krb5_ccache id;
+   char *residual;
 {
      int ret;
      

diff --git a/src/lib/krb5/ccache/file/fcc_sseq.c b/src/lib/krb5/ccache/file/fcc_sseq.c
index d8d72cec06760f41d727512463074f2caade303c..33178a2a5cb3ea0e4542ca64cd60541e00969bba 100644 (file)
--- a/src/lib/krb5/ccache/file/fcc_sseq.c
+++ b/src/lib/krb5/ccache/file/fcc_sseq.c
@@ -32,7 +32,9 @@ static char fcc_sseq_c[] = "$Id$";
  * system errors
  */
 krb5_error
-krb5_fcc_start_seq_get(krb5_ccache id, krb5_cc_cursor *cursor)
+krb5_fcc_start_seq_get(id, cursor)
+   krb5_ccache id;
+   krb5_cc_cursor *cursor;
 {
      krb5_fcc_cursor *fcursor;
      

diff --git a/src/lib/krb5/ccache/file/fcc_store.c b/src/lib/krb5/ccache/file/fcc_store.c
index 12171daaf0e88352bfc34e87776c726e6b702211..83d949117363ed776946b42c41911d38bab46aa8 100644 (file)
--- a/src/lib/krb5/ccache/file/fcc_store.c
+++ b/src/lib/krb5/ccache/file/fcc_store.c
@@ -40,7 +40,9 @@ static char fcc_store_c[] = "$Id$";
  * storage failure errors
  */
 krb5_error
-krb5_fcc_store(krb5_ccache id, krb5_creds *creds)
+krb5_fcc_store(id, creds)
+   krb5_ccache id;
+   krb5_creds *creds;
 {
 #define TCHECK(ret) if (ret != KRB5_OK) goto lose;
      krb5_error ret;
@@ -96,7 +98,9 @@ lose:
  */
 
 static krb5_error
-krb5_fcc_store_principal(krb5_ccache id, krb5_principal princ)
+krb5_fcc_store_principal(id, princ)
+   krb5_ccache id;
+   krb5_principal princ;
 {
      krb5_error ret;
      krb5_principal temp;
@@ -118,7 +122,9 @@ krb5_fcc_store_principal(krb5_ccache id, krb5_principal princ)
 }
 
 static krb5_error
-krb5_store_keyblock(krb5_ccache id, krb5_keyblock *keyblock)
+krb5_store_keyblock(id, keyblock)
+   krb5_ccache id;
+   krb5_keyblock *keyblock;
 {
      krb5_error ret;
 
@@ -135,7 +141,9 @@ krb5_store_keyblock(krb5_ccache id, krb5_keyblock *keyblock)
 
 
 static krb5_error
-krb5_fcc_store_data(krb5_ccache id, krb5_data *data)
+krb5_fcc_store_data(id, data)
+   krb5_ccache id;
+   krb5_data *data;
 {
      krb5_error ret;