[PATCH] zlib cleanup: OF

Remove the stale support for K&R function declarations through the OF()
macro.

This is the last patch to clean up zconf.h, at least for now.

9 files changed, 72 insertions, 72 deletions

diff --git a/lib/zlib_deflate/deflate.c b/lib/zlib_deflate/deflate.c
index 6d18ba65d09346..ccf0cdd93cc7af 100644
--- a/lib/zlib_deflate/deflate.c
+++ b/lib/zlib_deflate/deflate.c
@@ -63,22 +63,22 @@ typedef enum {
     finish_done     /* finish done, accept no more input or output */
 } block_state;
 
-typedef block_state (*compress_func) OF((deflate_state *s, int flush));
+typedef block_state (*compress_func) (deflate_state *s, int flush);
 /* Compression function. Returns the block state after the call. */
 
-local void fill_window    OF((deflate_state *s));
-local block_state deflate_stored OF((deflate_state *s, int flush));
-local block_state deflate_fast   OF((deflate_state *s, int flush));
-local block_state deflate_slow   OF((deflate_state *s, int flush));
-local void lm_init        OF((deflate_state *s));
-local void putShortMSB    OF((deflate_state *s, uInt b));
-local void flush_pending  OF((z_streamp strm));
-local int read_buf        OF((z_streamp strm, Byte *buf, unsigned size));
-local uInt longest_match  OF((deflate_state *s, IPos cur_match));
+local void fill_window    (deflate_state *s);
+local block_state deflate_stored (deflate_state *s, int flush);
+local block_state deflate_fast   (deflate_state *s, int flush);
+local block_state deflate_slow   (deflate_state *s, int flush);
+local void lm_init        (deflate_state *s);
+local void putShortMSB    (deflate_state *s, uInt b);
+local void flush_pending  (z_streamp strm);
+local int read_buf        (z_streamp strm, Byte *buf, unsigned size);
+local uInt longest_match  (deflate_state *s, IPos cur_match);
 
 #ifdef DEBUG_ZLIB
-local  void check_match OF((deflate_state *s, IPos start, IPos match,
-                            int length));
+local  void check_match (deflate_state *s, IPos start, IPos match,
+                         int length);
 #endif
 
 /* ===========================================================================
diff --git a/lib/zlib_deflate/deftree.c b/lib/zlib_deflate/deftree.c
index 8cf537b386b140..8f7ecf5ecabe48 100644
--- a/lib/zlib_deflate/deftree.c
+++ b/lib/zlib_deflate/deftree.c
@@ -132,25 +132,25 @@ local static_tree_desc  static_bl_desc =
  * Local (static) routines in this file.
  */
 
-local void tr_static_init OF((void));
-local void init_block     OF((deflate_state *s));
-local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k));
-local void gen_bitlen     OF((deflate_state *s, tree_desc *desc));
-local void gen_codes      OF((ct_data *tree, int max_code, ush *bl_count));
-local void build_tree     OF((deflate_state *s, tree_desc *desc));
-local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local int  build_bl_tree  OF((deflate_state *s));
-local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
-                              int blcodes));
-local void compress_block OF((deflate_state *s, ct_data *ltree,
-                              ct_data *dtree));
-local void set_data_type  OF((deflate_state *s));
-local unsigned bi_reverse OF((unsigned value, int length));
-local void bi_windup      OF((deflate_state *s));
-local void bi_flush       OF((deflate_state *s));
-local void copy_block     OF((deflate_state *s, char *buf, unsigned len,
-                              int header));
+local void tr_static_init (void);
+local void init_block     (deflate_state *s);
+local void pqdownheap     (deflate_state *s, ct_data *tree, int k);
+local void gen_bitlen     (deflate_state *s, tree_desc *desc);
+local void gen_codes      (ct_data *tree, int max_code, ush *bl_count);
+local void build_tree     (deflate_state *s, tree_desc *desc);
+local void scan_tree      (deflate_state *s, ct_data *tree, int max_code);
+local void send_tree      (deflate_state *s, ct_data *tree, int max_code);
+local int  build_bl_tree  (deflate_state *s);
+local void send_all_trees (deflate_state *s, int lcodes, int dcodes,
+                           int blcodes);
+local void compress_block (deflate_state *s, ct_data *ltree,
+                           ct_data *dtree);
+local void set_data_type  (deflate_state *s);
+local unsigned bi_reverse (unsigned value, int length);
+local void bi_windup      (deflate_state *s);
+local void bi_flush       (deflate_state *s);
+local void copy_block     (deflate_state *s, char *buf, unsigned len,
+                           int header);
 
 #ifndef DEBUG_ZLIB
 #  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
@@ -174,7 +174,7 @@ local void copy_block     OF((deflate_state *s, char *buf, unsigned len,
  * IN assertion: length <= 16 and value fits in length bits.
  */
 #ifdef DEBUG_ZLIB
-local void send_bits      OF((deflate_state *s, int value, int length));
+local void send_bits      (deflate_state *s, int value, int length);
 
 local void send_bits(
 	deflate_state *s,
diff --git a/lib/zlib_deflate/defutil.h b/lib/zlib_deflate/defutil.h
index f389fb97dff046..d9feaf638608a6 100644
--- a/lib/zlib_deflate/defutil.h
+++ b/lib/zlib_deflate/defutil.h
@@ -264,14 +264,14 @@ typedef struct deflate_workspace {
  */
 
         /* in trees.c */
-void zlib_tr_init         OF((deflate_state *s));
-int  zlib_tr_tally        OF((deflate_state *s, unsigned dist, unsigned lc));
-ulg  zlib_tr_flush_block  OF((deflate_state *s, char *buf, ulg stored_len,
-			      int eof));
-void zlib_tr_align        OF((deflate_state *s));
-void zlib_tr_stored_block OF((deflate_state *s, char *buf, ulg stored_len,
-			      int eof));
-void zlib_tr_stored_type_only OF((deflate_state *));
+void zlib_tr_init         (deflate_state *s);
+int  zlib_tr_tally        (deflate_state *s, unsigned dist, unsigned lc);
+ulg  zlib_tr_flush_block  (deflate_state *s, char *buf, ulg stored_len,
+			   int eof);
+void zlib_tr_align        (deflate_state *s);
+void zlib_tr_stored_block (deflate_state *s, char *buf, ulg stored_len,
+			   int eof);
+void zlib_tr_stored_type_only (deflate_state *);
 
 
 /* ===========================================================================
diff --git a/lib/zlib_inflate/infblock.h b/lib/zlib_inflate/infblock.h
index b5d2200a5e2544..f5221ddf605402 100644
--- a/lib/zlib_inflate/infblock.h
+++ b/lib/zlib_inflate/infblock.h
@@ -14,31 +14,31 @@
 struct inflate_blocks_state;
 typedef struct inflate_blocks_state inflate_blocks_statef;
 
-extern inflate_blocks_statef * zlib_inflate_blocks_new OF((
+extern inflate_blocks_statef * zlib_inflate_blocks_new (
     z_streamp z,
-    check_func c,               /* check function */
-    uInt w));                   /* window size */
+    check_func c,              /* check function */
+    uInt w);                   /* window size */
 
-extern int zlib_inflate_blocks OF((
+extern int zlib_inflate_blocks (
     inflate_blocks_statef *,
     z_streamp ,
-    int));                      /* initial return code */
+    int);                      /* initial return code */
 
-extern void zlib_inflate_blocks_reset OF((
+extern void zlib_inflate_blocks_reset (
     inflate_blocks_statef *,
     z_streamp ,
-    uLong *));                  /* check value on output */
+    uLong *);                  /* check value on output */
 
-extern int zlib_inflate_blocks_free OF((
+extern int zlib_inflate_blocks_free (
     inflate_blocks_statef *,
-    z_streamp));
+    z_streamp);
 
-extern void zlib_inflate_set_dictionary OF((
+extern void zlib_inflate_set_dictionary (
     inflate_blocks_statef *s,
-    const Byte *d,   /* dictionary */
-    uInt  n));       /* dictionary length */
+    const Byte *d,  /* dictionary */
+    uInt  n);       /* dictionary length */
 
-extern int zlib_inflate_blocks_sync_point OF((
-    inflate_blocks_statef *s));
+extern int zlib_inflate_blocks_sync_point (
+    inflate_blocks_statef *s);
 
 #endif /* _INFBLOCK_H */
diff --git a/lib/zlib_inflate/infcodes.h b/lib/zlib_inflate/infcodes.h
index eacf768a7937bb..5cff417523b0a9 100644
--- a/lib/zlib_inflate/infcodes.h
+++ b/lib/zlib_inflate/infcodes.h
@@ -16,18 +16,18 @@
 struct inflate_codes_state;
 typedef struct inflate_codes_state inflate_codes_statef;
 
-extern inflate_codes_statef *zlib_inflate_codes_new OF((
+extern inflate_codes_statef *zlib_inflate_codes_new (
     uInt, uInt,
     inflate_huft *, inflate_huft *,
-    z_streamp ));
+    z_streamp );
 
-extern int zlib_inflate_codes OF((
+extern int zlib_inflate_codes (
     inflate_blocks_statef *,
     z_streamp ,
-    int));
+    int);
 
-extern void zlib_inflate_codes_free OF((
+extern void zlib_inflate_codes_free (
     inflate_codes_statef *,
-    z_streamp ));
+    z_streamp );
 
 #endif /* _INFCODES_H */
diff --git a/lib/zlib_inflate/inffast.h b/lib/zlib_inflate/inffast.h
index 986768a856d414..fc720f0fa7f55b 100644
--- a/lib/zlib_inflate/inffast.h
+++ b/lib/zlib_inflate/inffast.h
@@ -8,10 +8,10 @@
    subject to change. Applications should only use zlib.h.
  */
 
-extern int zlib_inflate_fast OF((
+extern int zlib_inflate_fast (
     uInt,
     uInt,
     inflate_huft *,
     inflate_huft *,
     inflate_blocks_statef *,
-    z_streamp ));
+    z_streamp );
diff --git a/lib/zlib_inflate/inftrees.c b/lib/zlib_inflate/inftrees.c
index 2dfb41879ee07d..363c6c067ba00e 100644
--- a/lib/zlib_inflate/inftrees.c
+++ b/lib/zlib_inflate/inftrees.c
@@ -22,7 +22,7 @@ struct internal_state;
 #define bits word.what.Bits
 
 
-local int huft_build OF((
+local int huft_build (
     uInt *,             /* code lengths in bits */
     uInt,               /* number of codes */
     uInt,               /* number of "simple" codes */
@@ -32,7 +32,7 @@ local int huft_build OF((
     uInt *,             /* maximum lookup bits (returns actual) */
     inflate_huft *,     /* space for trees */
     uInt *,             /* hufts used in space */
-    uInt * ));          /* space for values */
+    uInt * );           /* space for values */
 
 /* Tables for deflate from PKZIP's appnote.txt. */
 local const uInt cplens[31] = { /* Copy lengths for literal codes 257..285 */
diff --git a/lib/zlib_inflate/inftrees.h b/lib/zlib_inflate/inftrees.h
index f5a67aa9ea5a0d..efb3d8a4f79b87 100644
--- a/lib/zlib_inflate/inftrees.h
+++ b/lib/zlib_inflate/inftrees.h
@@ -35,14 +35,14 @@ struct inflate_huft_s {
    value below is more than safe. */
 #define MANY 1440
 
-extern int zlib_inflate_trees_bits OF((
+extern int zlib_inflate_trees_bits (
     uInt *,                     /* 19 code lengths */
     uInt *,                     /* bits tree desired/actual depth */
     inflate_huft **,            /* bits tree result */
     inflate_huft *,             /* space for trees */
-    z_streamp));                /* for messages */
+    z_streamp);                 /* for messages */
 
-extern int zlib_inflate_trees_dynamic OF((
+extern int zlib_inflate_trees_dynamic (
     uInt,                       /* number of literal/length codes */
     uInt,                       /* number of distance codes */
     uInt *,                     /* that many (total) code lengths */
@@ -51,13 +51,13 @@ extern int zlib_inflate_trees_dynamic OF((
     inflate_huft **,            /* literal/length tree result */
     inflate_huft **,            /* distance tree result */
     inflate_huft *,             /* space for trees */
-    z_streamp));                /* for messages */
+    z_streamp);                 /* for messages */
 
-extern int zlib_inflate_trees_fixed OF((
+extern int zlib_inflate_trees_fixed (
     uInt *,                     /* literal desired/actual bit depth */
     uInt *,                     /* distance desired/actual bit depth */
     inflate_huft **,            /* literal/length tree result */
     inflate_huft **,            /* distance tree result */
-    z_streamp));                /* for memory allocation */
+    z_streamp);                 /* for memory allocation */
 
 #endif /* _INFTREES_H */
diff --git a/lib/zlib_inflate/infutil.h b/lib/zlib_inflate/infutil.h
index 2c4e3fbdddf2a6..a15875fc5f7281 100644
--- a/lib/zlib_inflate/infutil.h
+++ b/lib/zlib_inflate/infutil.h
@@ -92,10 +92,10 @@ struct inflate_blocks_state {
 extern uInt zlib_inflate_mask[17];
 
 /* copy as much as possible from the sliding window to the output area */
-extern int zlib_inflate_flush OF((
+extern int zlib_inflate_flush (
     inflate_blocks_statef *,
     z_streamp ,
-    int));
+    int);
 
 /* inflate private state */
 typedef enum {