fix gcc warnings on shadowed declarations

[paraslash.git] / dccp_send.c

diff --git a/dccp_send.c b/dccp_send.c
index cfff30933ca5a57fc7ecf6f3d5cb06a5a9481ef3..aba21a6db1d2e92aa997a964a053d8000df9b2f1 100644 (file)
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -34,7 +34,7 @@
 #include "fd.h"
 #include "close_on_fork.h"
 #include "server.cmdline.h"
-extern struct gengetopt_args_info conf;
+
 /** the list of connected clients **/
 static struct list_head clients;
 static int listen_fd = -1;
@@ -122,11 +122,11 @@ static void dccp_shutdown_client(struct dccp_client *dc)
 
 static int dccp_write(int fd, const char *buf, size_t len)
 {
-       size_t send, written = 0;
+       size_t size, written = 0;
        int ret;
 again:
-       send = PARA_MIN(1024, len - written);
-       ret = write(fd, buf + written, send);
+       size = PARA_MIN(1024, len - written);
+       ret = write(fd, buf + written, size);
        if (ret < 0)
                goto err_out;
        written += ret;