Prevent some type incompatibility warnings.

diff --git a/common/parse.c b/common/parse.c
index f4268171d6adc7a5656a52e1acfe0449220acb63..7f8a1980c8c997ad23bded560a3f2e2cf0d8d8ec 100644 (file)
--- a/common/parse.c
+++ b/common/parse.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: parse.c,v 1.3 1998/03/15 20:53:12 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: parse.c,v 1.4 1998/03/15 21:16:23 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -346,8 +346,8 @@ unsigned char *parse_numeric_aggregate (cfile, buf,
                        t = (unsigned char *)malloc (strlen (val) + 1);
                        if (!t)
                                error ("no temp space for number.");
-                       strcpy (t, val);
-                       c = cons (t, c);
+                       strcpy ((char *)t, val);
+                       c = cons ((caddr_t)t, c);
                }
        } while (++count != *max);
 

diff --git a/server/confpars.c b/server/confpars.c
index b8487c16fb420545d5ee522320574f64dd2480c4..1fa81e35c900204c5599024ac75724562e0bbf8e 100644 (file)
--- a/server/confpars.c
+++ b/server/confpars.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: confpars.c,v 1.45 1997/10/27 20:22:40 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: confpars.c,v 1.46 1998/03/15 21:16:39 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -958,7 +958,8 @@ void parse_option_param (cfile, group)
                                        token = next_token (&val, cfile);
                                        tree = tree_concat
                                                (tree,
-                                                tree_const (val,
+                                                tree_const ((unsigned char *)
+                                                            val,
                                                             strlen (val)));
                                } else {
                                        parse_warn ("expecting string %s.",
@@ -978,8 +979,9 @@ void parse_option_param (cfile, group)
                                        return;
                                }
                                tree = tree_concat (tree,
-                                                   tree_const (val,
-                                                               strlen (val)));
+                                                   tree_const
+                                                   ((unsigned char *) val,
+                                                   strlen (val)));
                                break;
 
                              case 'I': /* IP address or hostname. */