From d491de68962d4d56a5105f5b661fe7e9df739b42 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Mon, 10 Oct 2011 19:38:23 +0000
Subject: [PATCH] More js_ValueToStringBytes() removal
---
src/sbbs3/js_console.cpp | 3 ++-
src/sbbs3/js_global.c | 29 +++++++++++++++++++----------
src/sbbs3/js_sprintf.c | 3 ++-
src/sbbs3/services.c | 3 ++-
4 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/src/sbbs3/js_console.cpp b/src/sbbs3/js_console.cpp
index 65cce95c61..eabad600e7 100644
--- a/src/sbbs3/js_console.cpp
+++ b/src/sbbs3/js_console.cpp
@@ -942,7 +942,8 @@ js_print(JSContext *cx, uintN argc, jsval *arglist)
return(JS_FALSE);
for (i = 0; i < argc; i++) {
- if((cstr=js_ValueToStringBytes(cx, argv[i], NULL))==NULL)
+ JSVALUE_TO_STRING(cx, argv[i], cstr);
+ if(cstr==NULL)
return(JS_FALSE);
rc=JS_SUSPENDREQUEST(cx);
sbbs->bputs(cstr);
diff --git a/src/sbbs3/js_global.c b/src/sbbs3/js_global.c
index 5ab98a5c02..947b9047e3 100644
--- a/src/sbbs3/js_global.c
+++ b/src/sbbs3/js_global.c
@@ -242,7 +242,7 @@ js_load(JSContext *cx, uintN argc, jsval *arglist)
char path[MAX_PATH+1];
uintN i;
uintN argn=0;
- const char* filename;
+ char* filename;
JSObject* script;
private_t* p;
jsval val;
@@ -350,7 +350,8 @@ js_load(JSContext *cx, uintN argc, jsval *arglist)
JS_ReportError(cx,"no filename specified");
return(JS_FALSE);
}
- if((filename=js_ValueToStringBytes(cx, argv[argn++], NULL))==NULL)
+ JSVALUE_TO_STRING(cx, argv[argn++], filename);
+ if(filename==NULL)
return(JS_FALSE);
if(argc>argn || background) {
@@ -2253,7 +2254,8 @@ js_truncstr(JSContext *cx, uintN argc, jsval *arglist)
if(str==NULL)
return(JS_FALSE);
- if((set=js_ValueToStringBytes(cx, argv[1], NULL))==NULL)
+ JSVALUE_TO_STRING(cx, argv[1], set);
+ if(set==NULL)
return(JS_FALSE);
if((p=strdup(str))==NULL)
@@ -2480,7 +2482,8 @@ js_cfgfname(JSContext *cx, uintN argc, jsval *arglist)
if(path==NULL)
return(JS_FALSE);
- if((fname=js_ValueToStringBytes(cx, argv[1], NULL))==NULL)
+ JSVALUE_TO_STRING(cx, argv[1], fname);
+ if(fname==NULL)
return(JS_FALSE);
rc=JS_SUSPENDREQUEST(cx);
@@ -2578,7 +2581,8 @@ js_rename(JSContext *cx, uintN argc, jsval *arglist)
JSVALUE_TO_STRING(cx, argv[0], oldname);
if(oldname==NULL)
return(JS_TRUE);
- if((newname=js_ValueToStringBytes(cx, argv[1], NULL))==NULL)
+ JSVALUE_TO_STRING(cx, argv[1], newname);
+ if(newname==NULL)
return(JS_TRUE);
rc=JS_SUSPENDREQUEST(cx);
@@ -2605,7 +2609,8 @@ js_fcopy(JSContext *cx, uintN argc, jsval *arglist)
JSVALUE_TO_STRING(cx, argv[0], src);
if(src==NULL)
return(JS_TRUE);
- if((dest=js_ValueToStringBytes(cx, argv[1], NULL))==NULL)
+ JSVALUE_TO_STRING(cx, argv[1], dest);
+ if(dest==NULL)
return(JS_TRUE);
rc=JS_SUSPENDREQUEST(cx);
@@ -2632,7 +2637,8 @@ js_fcompare(JSContext *cx, uintN argc, jsval *arglist)
JSVALUE_TO_STRING(cx, argv[0], fn1);
if(fn1==NULL)
return(JS_TRUE);
- if((fn2=js_ValueToStringBytes(cx, argv[1], NULL))==NULL)
+ JSVALUE_TO_STRING(cx, argv[1], fn2);
+ if(fn2==NULL)
return(JS_TRUE);
rc=JS_SUSPENDREQUEST(cx);
@@ -2851,7 +2857,8 @@ js_fmutex(JSContext *cx, uintN argc, jsval *arglist)
if(JSVAL_IS_VOID(argv[0]))
return(JS_TRUE);
- if((fname=js_ValueToStringBytes(cx, argv[argn++], NULL))==NULL)
+ JSVALUE_TO_STRING(cx, argv[argn++], fname);
+ if(fname==NULL)
return(JS_FALSE);
if(argc > argn && JSVAL_IS_STRING(argv[argn]))
text=js_ValueToStringBytes(cx, argv[argn++], NULL);
@@ -2966,11 +2973,13 @@ js_wildmatch(JSContext *cx, uintN argc, jsval *arglist)
if(JSVAL_IS_BOOLEAN(argv[argn]))
JS_ValueToBoolean(cx, argv[argn++], &case_sensitive);
- if((fname=js_ValueToStringBytes(cx, argv[argn++], NULL))==NULL)
+ JSVALUE_TO_STRING(cx, argv[argn++], fname);
+ if(fname==NULL)
return(JS_FALSE);
if(argn<argc && argv[argn]!=JSVAL_VOID)
- if((spec=js_ValueToStringBytes(cx, argv[argn++], NULL))==NULL)
+ JSVALUE_TO_STRING(cx, argv[argn++], spec);
+ if(spec==NULL)
return(JS_FALSE);
if(argn<argc && argv[argn]!=JSVAL_VOID)
diff --git a/src/sbbs3/js_sprintf.c b/src/sbbs3/js_sprintf.c
index e49feca48b..741edc805c 100644
--- a/src/sbbs3/js_sprintf.c
+++ b/src/sbbs3/js_sprintf.c
@@ -44,7 +44,8 @@ js_sprintf(JSContext *cx, uint argn, uintN argc, jsval *argv)
char* p,*p2;
JSString* str;
- if((p=js_ValueToStringBytes(cx, argv[argn++], NULL))==NULL)
+ JSVALUE_TO_STRING(cx, argv[argn++], p);
+ if(p==NULL)
return(NULL);
p=xp_asprintf_start(p);
diff --git a/src/sbbs3/services.c b/src/sbbs3/services.c
index e7f6aa28fc..3a0e073862 100644
--- a/src/sbbs3/services.c
+++ b/src/sbbs3/services.c
@@ -491,7 +491,8 @@ js_login(JSContext *cx, uintN argc, jsval *arglist)
return(JS_FALSE);
/* Password */
- if((pass=js_ValueToStringBytes(cx, argv[1], NULL))==NULL)
+ JSVALUE_TO_STRING(cx, argv[1], pass);
+ if(pass==NULL)
return(JS_FALSE);
rc=JS_SUSPENDREQUEST(cx);
--
GitLab