Skip to content
Snippets Groups Projects
Commit 4a50048e authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Fix invalid type in argument to printf format specifier

CID 319135

Fix the return value of js_socket_sendfilesocket() while we're here (off_t instead of int).
parent d7396cb5
No related branches found
No related tags found
1 merge request!463MRC mods by Codefenix (2024-10-20)
...@@ -64,7 +64,7 @@ static BOOL js_socket_peek_byte(JSContext *cx, js_socket_private_t *p); ...@@ -64,7 +64,7 @@ static BOOL js_socket_peek_byte(JSContext *cx, js_socket_private_t *p);
static JSBool js_socket_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp); static JSBool js_socket_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp);
static ptrdiff_t js_socket_recv(JSContext *cx, js_socket_private_t *p, void *buf, size_t len, int flags, int timeout); static ptrdiff_t js_socket_recv(JSContext *cx, js_socket_private_t *p, void *buf, size_t len, int flags, int timeout);
static JSBool js_socket_resolve(JSContext *cx, JSObject *obj, jsid id); static JSBool js_socket_resolve(JSContext *cx, JSObject *obj, jsid id);
static int js_socket_sendfilesocket(js_socket_private_t *p, int file, off_t *offset, off_t count); static off_t js_socket_sendfilesocket(js_socket_private_t *p, int file, off_t *offset, off_t count);
static ptrdiff_t js_socket_sendsocket(js_socket_private_t *p, const void *msg, size_t len, int flush); static ptrdiff_t js_socket_sendsocket(js_socket_private_t *p, const void *msg, size_t len, int flush);
static JSBool js_socket_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp); static JSBool js_socket_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp);
static JSBool js_install_event(JSContext *cx, uintN argc, jsval *arglist, BOOL once); static JSBool js_install_event(JSContext *cx, uintN argc, jsval *arglist, BOOL once);
...@@ -369,13 +369,13 @@ static ptrdiff_t js_socket_sendsocket(js_socket_private_t *p, const void *msg, s ...@@ -369,13 +369,13 @@ static ptrdiff_t js_socket_sendsocket(js_socket_private_t *p, const void *msg, s
return total; return total;
} }
static int js_socket_sendfilesocket(js_socket_private_t *p, int file, off_t *offset, off_t count) static off_t js_socket_sendfilesocket(js_socket_private_t *p, int file, off_t *offset, off_t count)
{ {
char buf[1024*16]; char buf[1024*16];
off_t len; off_t len;
int rd; int rd;
int wr=0; int wr=0;
int total=0; off_t total=0;
int i; int i;
if(p->session==-1) if(p->session==-1)
...@@ -1275,7 +1275,7 @@ js_sendfile(JSContext *cx, uintN argc, jsval *arglist) ...@@ -1275,7 +1275,7 @@ js_sendfile(JSContext *cx, uintN argc, jsval *arglist)
JSObject *obj=JS_THIS_OBJECT(cx, arglist); JSObject *obj=JS_THIS_OBJECT(cx, arglist);
jsval *argv=JS_ARGV(cx, arglist); jsval *argv=JS_ARGV(cx, arglist);
char* fname = NULL; char* fname = NULL;
long len; off_t len;
int file; int file;
js_socket_private_t* p; js_socket_private_t* p;
jsrefcount rc; jsrefcount rc;
...@@ -1305,7 +1305,7 @@ js_sendfile(JSContext *cx, uintN argc, jsval *arglist) ...@@ -1305,7 +1305,7 @@ js_sendfile(JSContext *cx, uintN argc, jsval *arglist)
len = js_socket_sendfilesocket(p, file, NULL, 0); len = js_socket_sendfilesocket(p, file, NULL, 0);
close(file); close(file);
if(len > 0) { if(len > 0) {
dbprintf(FALSE, p, "sent %u bytes",len); dbprintf(FALSE, p, "sent %"PRIdOFF" bytes",len);
JS_SET_RVAL(cx, arglist, JSVAL_TRUE); JS_SET_RVAL(cx, arglist, JSVAL_TRUE);
} else { } else {
p->last_error=ERROR_VALUE; p->last_error=ERROR_VALUE;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment