Skip to content
Snippets Groups Projects
Commit d91374d1 authored by rswindell's avatar rswindell
Browse files

getsockopt() takes a void* opt parameter in libc.

parent 44cec9e3
No related branches found
No related tags found
No related merge requests found
...@@ -462,7 +462,7 @@ js_getsockopt(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ...@@ -462,7 +462,7 @@ js_getsockopt(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval
opt = sockopt(JS_GetStringBytes(JS_ValueToString(cx,argv[0]))); opt = sockopt(JS_GetStringBytes(JS_ValueToString(cx,argv[0])));
len = sizeof(val); len = sizeof(val);
if(getsockopt(p->sock,SOL_SOCKET,opt,(char*)&val,&len)==0) { if(getsockopt(p->sock,SOL_SOCKET,opt,(void*)&val,&len)==0) {
dbprintf(FALSE, p, "option %d = %d",opt,val); dbprintf(FALSE, p, "option %d = %d",opt,val);
*rval = INT_TO_JSVAL(val); *rval = INT_TO_JSVAL(val);
} else { } else {
......
...@@ -94,7 +94,7 @@ int DLLCALL set_socket_options(scfg_t* cfg, SOCKET sock, char* error) ...@@ -94,7 +94,7 @@ int DLLCALL set_socket_options(scfg_t* cfg, SOCKET sock, char* error)
return(0); return(0);
len = sizeof(type); len = sizeof(type);
result=getsockopt(sock,SOL_SOCKET,SO_TYPE,(char*)&type,&len); result=getsockopt(sock,SOL_SOCKET,SO_TYPE,(void*)&type,&len);
if(result) { if(result) {
sprintf(error,"%d getting socket option (TYPE, %d)" sprintf(error,"%d getting socket option (TYPE, %d)"
,ERROR_VALUE, SO_TYPE); ,ERROR_VALUE, SO_TYPE);
...@@ -140,7 +140,7 @@ int DLLCALL set_socket_options(scfg_t* cfg, SOCKET sock, char* error) ...@@ -140,7 +140,7 @@ int DLLCALL set_socket_options(scfg_t* cfg, SOCKET sock, char* error)
} }
#if 0 #if 0
len = sizeof(value); len = sizeof(value);
getsockopt(sock,SOL_SOCKET,option,(char*)&value,&len); getsockopt(sock,SOL_SOCKET,option,(void*)&value,&len);
lprintf("%04d socket option: %s set to %d", sock, str, value); lprintf("%04d socket option: %s set to %d", sock, str, value);
#endif #endif
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment