commit 3f423c9c8fe197af5fa3b5945bc7d3f3ceec3512
author bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Sun Apr 30 21:34:15 2006 +0000
committer bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Sun Apr 30 21:34:15 2006 +0000
tree 650548f19383a1af71838d9cc29add21a75ecea7
parent 7f881e5674f9a3839e454436ed6c1c5ca3a6b757

removed warnings


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1871 c046a42c-6fe2-441c-8c8c-71466251a162

slirp/libslirp.h

diff --git a/slirp/libslirp.h b/slirp/libslirp.h
index 36c8ec2..a9260af 100644
--- a/slirp/libslirp.h
+++ b/slirp/libslirp.h
@@ -32,7 +32,7 @@
                    int guest_port);
 
 extern const char *tftp_prefix;
-extern const char slirp_hostname[33];
+extern char slirp_hostname[33];
 
 #ifdef __cplusplus
 }

slirp/slirp.c

diff --git a/slirp/slirp.c b/slirp/slirp.c
index b4ab12a..1331d0e 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -25,7 +25,7 @@
 /* XXX: suppress those select globals */
 fd_set *global_readfds, *global_writefds, *global_xfds;
 
-const char slirp_hostname[33];
+char slirp_hostname[33];
 
 #ifdef _WIN32
 

vl.c

diff --git a/vl.c b/vl.c
index 64fcfb4..bfc1490 100644
--- a/vl.c
+++ b/vl.c
@@ -3132,9 +3132,7 @@
 #ifdef CONFIG_SLIRP
     if (!strcmp(device, "user")) {
         if (get_param_value(buf, sizeof(buf), "hostname", p)) {
-            if (strlen(buf) > 32)
-              buf[32] = 0;
-            strcpy(slirp_hostname, buf);
+            pstrcpy(slirp_hostname, sizeof(slirp_hostname), buf);
         }
         ret = net_slirp_init(vlan);
     } else