Get rid of some BSD cdef goo that doesn't belong.

diff --git a/includes/minires/minires.h b/includes/minires/minires.h
index 79588ad9af39af35d8834d3e7ac9714cf0717b42..e43daaf506edafadcbc9c03d9f9c15a648fba1bb 100644 (file)
--- a/includes/minires/minires.h
+++ b/includes/minires/minires.h
@@ -41,7 +41,7 @@ int res_servicenumber(const char *);
 int res_protocolnumber(const char *);
 const char *res_protocolname(int);
 const char *res_servicename(u_int16_t, const char *);
-u_int32_t ns_datetosecs __P((const char *cp, int *errp));
+u_int32_t ns_datetosecs (const char *cp, int *errp);
 int b64_pton (char const *, unsigned char *, size_t);
 int res_ninit (res_state);
 unsigned int res_randomid (void);
@@ -70,8 +70,8 @@ const char *p_section (int section, int opcode);
 int ns_makecanon (const char *, char *, size_t);
 int ns_parserr (ns_msg *, ns_sect, int, ns_rr *);
 int ns_samedomain (const char *, const char *);
-int ns_name_uncompress __P((const u_char *, const u_char *,
-                           const u_char *, char *, size_t));
+int ns_name_uncompress (const u_char *, const u_char *,
+                           const u_char *, char *, size_t);
 int res_nmkquery (res_state, int,
                  const char *, ns_class, ns_type, const unsigned char *,
                  unsigned, const unsigned char *, unsigned char *, unsigned);

diff --git a/includes/minires/resolv.h b/includes/minires/resolv.h
index 87b1d11b0afdf19c0729fbebde5b0ad27bd7cdf5..0d155bd9aac420f232c10aa79316bd6f27c6e219 100644 (file)
--- a/includes/minires/resolv.h
+++ b/includes/minires/resolv.h
@@ -50,7 +50,7 @@
 
 /*
  *     @(#)resolv.h    8.1 (Berkeley) 6/2/93
- *     $Id: resolv.h,v 1.1 2000/02/02 05:49:29 mellon Exp $
+ *     $Id: resolv.h,v 1.2 2000/02/02 07:37:17 mellon Exp $
  */
 
 #ifndef _RESOLV_H_
@@ -92,19 +92,19 @@ void __h_errno_set(struct __res_state *res, int err);
 typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error }
        res_sendhookact;
 
-typedef res_sendhookact (*res_send_qhook)__P((struct sockaddr_in * const *ns,
+typedef res_sendhookact (*res_send_qhook) (struct sockaddr_in * const *ns,
                                              u_char **query,
                                              unsigned *querylen,
                                              u_char *ans,
                                              unsigned anssiz,
-                                             int *resplen));
+                                             int *resplen);
 
-typedef res_sendhookact (*res_send_rhook)__P((const struct sockaddr_in *ns,
+typedef res_sendhookact (*res_send_rhook) (const struct sockaddr_in *ns,
                                              u_char *query,
                                              unsigned querylen,
                                              u_char *ans,
                                              unsigned anssiz,
-                                             int *resplen));
+                                             int *resplen);
 
 struct res_sym {
        int     number;         /* Identifying number, like T_MX */

diff --git a/minires/hmac_link.c b/minires/hmac_link.c
index 31b42c7314e1cb0ea9543325f22b7c05f9f083db..f4d20938c73ca065218e227768140a3fb8744b4d 100644 (file)
--- a/minires/hmac_link.c
+++ b/minires/hmac_link.c
@@ -1,6 +1,6 @@
 #ifdef HMAC_MD5
 #ifndef LINT
-static const char rcsid[] = "$Header: /tmp/cvstest/DHCP/minires/Attic/hmac_link.c,v 1.1 2000/02/02 07:28:14 mellon Exp $";
+static const char rcsid[] = "$Header: /tmp/cvstest/DHCP/minires/Attic/hmac_link.c,v 1.2 2000/02/02 07:37:19 mellon Exp $";
 #endif
 /*
  * Portions Copyright (c) 1995-1998 by Trusted Information Systems, Inc.
@@ -429,7 +429,7 @@ static int
 dst_hmac_md5_generate_key(DST_KEY *key, const int nothing)
 {
        u_char *buff;
-       int i, n;
+       int n;
        unsigned size, len;
 
        if (key == NULL || key->dk_alg != KEY_HMAC_MD5)
@@ -443,7 +443,7 @@ dst_hmac_md5_generate_key(DST_KEY *key, const int nothing)
 
        n = dst_random(DST_RAND_SEMI, len, buff);
        n += dst_random(DST_RAND_KEY, len, buff);
-       if (n <= i) {   /* failed getting anything */
+       if (n <= len) { /* failed getting anything */
                SAFE_FREE2(buff, len);
                return (-1);
        }

diff --git a/minires/res_init.c b/minires/res_init.c
index 6cb7b3708f5a65c19496fdaed5a8d960c9f73b35..89671b8cb7a08152d6db8f8c302ece6d0c6fb2c4 100644 (file)
--- a/minires/res_init.c
+++ b/minires/res_init.c
@@ -70,7 +70,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_init.c   8.1 (Berkeley) 6/7/93";
-static const char rcsid[] = "$Id: res_init.c,v 1.1 2000/02/02 07:28:15 mellon Exp $";
+static const char rcsid[] = "$Id: res_init.c,v 1.2 2000/02/02 07:37:19 mellon Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -95,12 +95,12 @@ static const char rcsid[] = "$Id: res_init.c,v 1.1 2000/02/02 07:28:15 mellon Ex
 #define RFC1535
 #define DEBUG
 
-static void res_setoptions __P((res_state, const char *, const char *));
+static void res_setoptions (res_state, const char *, const char *);
 
 #ifdef RESOLVSORT
 static const char sort_mask[] = "/&";
 #define ISSORTMASK(ch) (strchr(sort_mask, ch) != NULL)
-static u_int32_t net_mask __P((struct in_addr));
+static u_int32_t net_mask (struct in_addr);
 #endif
 
 #if !defined(isascii)  /* XXX - could be a function */