removed warnings

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

diff --git a/slirp/libslirp.h b/slirp/libslirp.h
index 36c8ec21fdbd4405065aaeb75ae4fae32583916b..a9260afeb3cc7adbfbf0928341f07b693bcc0cbe 100644 (file)
--- a/slirp/libslirp.h
+++ b/slirp/libslirp.h
@@ -32,7 +32,7 @@ int slirp_add_exec(int do_pty, const char *args, int addr_low_byte,
                    int guest_port);
 
 extern const char *tftp_prefix;
-extern const char slirp_hostname[33];
+extern char slirp_hostname[33];
 
 #ifdef __cplusplus
 }

diff --git a/slirp/slirp.c b/slirp/slirp.c
index b4ab12a0888f9d81c0b51852d69b7337cf021dbe..1331d0ead7910eed0beca2395085cef4e14ce2a1 100644 (file)
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -25,7 +25,7 @@ struct ex_list *exec_list;
 /* XXX: suppress those select globals */
 fd_set *global_readfds, *global_writefds, *global_xfds;
 
-const char slirp_hostname[33];
+char slirp_hostname[33];
 
 #ifdef _WIN32
 

diff --git a/vl.c b/vl.c
index 64fcfb458afa0115ee5215a5c93bb36a0dff5948..bfc14902f5229196215dbf5a0b4b8b374b4d4ed8 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -3132,9 +3132,7 @@ int net_client_init(const char *str)
 #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