X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=lib%2Fuilib.c;h=2bd9575313eb91150e2d457b20257ead0014d34b;hb=42a9c63a4835e9990a2e6c0e1949b64ee4b318b2;hp=4d440de4a4c40b41af1c10eeb192670ca3de6df3;hpb=d3372da97568d5e1f35fa19787c8ec8af93a0435;p=doldaconnect.git

diff --git a/lib/uilib.c b/lib/uilib.c
index 4d440de..2bd9575 100644
--- a/lib/uilib.c
+++ b/lib/uilib.c
@@ -472,6 +472,7 @@ int dc_handleread(void)
     int ret, done;
     char *p1, *p2;
     size_t len;
+    socklen_t optlen;
     int errnobak;
     /* Ewww... this really is soo ugly. I need to clean this up some day. */
     static int pstate = 0;
@@ -481,7 +482,8 @@ int dc_handleread(void)
     static size_t cbufsize = 0, cbufdata = 0;
     static wchar_t *pptr = NULL;
     static wchar_t **argv = NULL;
-    static int argc = 0, args = 0;
+    static int argc = 0;
+    static size_t args = 0;
     static wchar_t *cw = NULL;
     static size_t cwsize = 0, cwdata = 0;
     static struct dc_response *curresp = NULL;
@@ -493,8 +495,8 @@ int dc_handleread(void)
     case -1:
 	return(-1);
     case 0:
-	len = sizeof(ret);
-	getsockopt(fd, SOL_SOCKET, SO_ERROR, &ret, &len);
+	optlen = sizeof(ret);
+	getsockopt(fd, SOL_SOCKET, SO_ERROR, &ret, &optlen);
 	if(ret)
 	{
 	    int newfd;
@@ -935,7 +937,7 @@ static int getsrvrr(char *name, char **host, int *port)
 #else
 static int getsrvrr(char *name, char **host, int *port)
 {
-    errno = EOPNOTSUP;
+    errno = EOPNOTSUPP;
     return(-1);
 }
 #endif
@@ -1039,7 +1041,7 @@ struct dc_intresp *dc_interpret(struct dc_response *resp)
     struct command *cmd;
     struct respclass *cls;
     int code;
-    int args;
+    size_t args;
     
     if((resp->numlines == 0) || (resp->rlines[0].argc == 0) || (resp->curline >= resp->numlines))
 	return(NULL);