From 7ae427b818d6ed13bd3271529a5908aa2a99edaa Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Mon, 10 Oct 2011 19:45:44 +0000
Subject: [PATCH] More regexps.

---
 src/sbbs3/js_global.c | 4 ++--
 src/sbbs3/js_uifc.c   | 2 +-
 src/sbbs3/websrvr.c   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/sbbs3/js_global.c b/src/sbbs3/js_global.c
index 947b9047e3..4819bd6801 100644
--- a/src/sbbs3/js_global.c
+++ b/src/sbbs3/js_global.c
@@ -964,7 +964,7 @@ js_quote_msg(JSContext *cx, uintN argc, jsval *arglist)
 		JS_ValueToInt32(cx,argv[1],&len);
 
 	if(argc>2)
-		prefix=js_ValueToStringBytes(cx, argv[2], NULL);
+		JSVALUE_TO_STRING(cx, argv[2], prefix);
 
 	if((outbuf=(char*)malloc((strlen(inbuf)*(strlen(prefix)+1))+1))==NULL)
 		return(JS_FALSE);
@@ -2861,7 +2861,7 @@ js_fmutex(JSContext *cx, uintN argc, jsval *arglist)
 	if(fname==NULL) 
 		return(JS_FALSE);
 	if(argc > argn && JSVAL_IS_STRING(argv[argn]))
-		text=js_ValueToStringBytes(cx, argv[argn++], NULL);
+		JSVALUE_TO_STRING(cx, argv[argn++], text);
 	if(argc > argn && JSVAL_IS_NUMBER(argv[argn]))
 		JS_ValueToInt32(cx, argv[argn++], &max_age);
 
diff --git a/src/sbbs3/js_uifc.c b/src/sbbs3/js_uifc.c
index 11e8592e7d..5d9a899154 100644
--- a/src/sbbs3/js_uifc.c
+++ b/src/sbbs3/js_uifc.c
@@ -341,7 +341,7 @@ js_uifc_pop(JSContext *cx, uintN argc, jsval *arglist)
 		return(JS_FALSE);
 
 	if(argc)
-		str=js_ValueToStringBytes(cx, argv[0], NULL);
+		JSVALUE_TO_STRING(cx, argv[0], str);
 
 	rc=JS_SUSPENDREQUEST(cx);
 	uifc->pop(str);
diff --git a/src/sbbs3/websrvr.c b/src/sbbs3/websrvr.c
index 6ce690dc12..ac0f341b49 100644
--- a/src/sbbs3/websrvr.c
+++ b/src/sbbs3/websrvr.c
@@ -4064,11 +4064,11 @@ js_set_cookie(JSContext *cx, uintN argc, jsval *arglist)
 		return(JS_FALSE);
 
 	header=header_buf;
-	p=js_ValueToStringBytes(cx, argv[0],NULL);
+	JSVALUE_TO_STRING(cx, argv[0], p);
 	if(!p)
 		return(JS_FALSE);
 	header+=sprintf(header,"Set-Cookie: %s=",p);
-	p=js_ValueToStringBytes(cx, argv[1],NULL);
+	JSVALUE_TO_STRING(cx, argv[1], p);
 	if(!p)
 		return(JS_FALSE);
 	header+=sprintf(header,"%s",p);
-- 
GitLab