Dolda2000 GitWeb
/
doldaconnect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version bump.
[doldaconnect.git]
/
lib
/
uilib.c
diff --git
a/lib/uilib.c
b/lib/uilib.c
index
4d440de
..
2bd9575
100644
(file)
--- 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;
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;
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 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;
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:
case -1:
return(-1);
case 0:
- len = sizeof(ret);
- getsockopt(fd, SOL_SOCKET, SO_ERROR, &ret, &len);
+
opt
len = sizeof(ret);
+ getsockopt(fd, SOL_SOCKET, SO_ERROR, &ret, &
opt
len);
if(ret)
{
int newfd;
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)
{
#else
static int getsrvrr(char *name, char **host, int *port)
{
- errno = EOPNOTSUP;
+ errno = EOPNOTSUP
P
;
return(-1);
}
#endif
return(-1);
}
#endif
@@
-1039,7
+1041,7
@@
struct dc_intresp *dc_interpret(struct dc_response *resp)
struct command *cmd;
struct respclass *cls;
int code;
struct command *cmd;
struct respclass *cls;
int code;
-
in
t args;
+
size_
t args;
if((resp->numlines == 0) || (resp->rlines[0].argc == 0) || (resp->curline >= resp->numlines))
return(NULL);
if((resp->numlines == 0) || (resp->rlines[0].argc == 0) || (resp->curline >= resp->numlines))
return(NULL);