diff --git a/src/sbbs3/js_system.c b/src/sbbs3/js_system.c index bb9e0c7e04272ee861918226ce59d07158372d9d..f7a8e1b5b0577b20f34a71e8b19fafc513e7f6de 100644 --- a/src/sbbs3/js_system.c +++ b/src/sbbs3/js_system.c @@ -771,7 +771,6 @@ js_username(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) return(JS_TRUE); } - static JSBool js_matchuser(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { @@ -849,69 +848,6 @@ js_matchuserdata(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *r return(JS_TRUE); } -static JSBool -js_matchallusers(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) -{ - char* p; - JSString* js_str; - int32 offset=0; - int32 usernumber=0; - int len; - scfg_t* cfg; - jsrefcount rc; - JSObject* array; - jsval val; - int result; - jsint line=0; - - if((cfg=(scfg_t*)JS_GetPrivate(cx,obj))==NULL) - return(JS_FALSE); - - JS_ValueToInt32(cx,argv[0],&offset); - rc=JS_SUSPENDREQUEST(cx); - len=user_rec_len(offset); - JS_RESUMEREQUEST(cx, rc); - - if(len<0) { - JS_ReportError(cx,"Invalid user data offset: %d", offset); - return(JS_FALSE); - } - - if((js_str=JS_ValueToString(cx, argv[1]))==NULL) { - *rval = INT_TO_JSVAL(0); - return(JS_TRUE); - } - - if((p=JS_GetStringBytes(js_str))==NULL) { - *rval = INT_TO_JSVAL(0); - return(JS_TRUE); - } - - if((array=JS_NewArrayObject(cx,0,NULL))==NULL) - return(JS_FALSE); - - while(1) { - rc=JS_SUSPENDREQUEST(cx); - result=userdatdupe(cfg,usernumber,offset,len,p,FALSE,TRUE); - if(result > 0) { - val = INT_TO_JSVAL(result); - if(!JS_SetElement(cx, array, line++, &val)) { - JS_RESUMEREQUEST(cx, rc); - break; - } - usernumber=result; - result=0; - } else { - JS_RESUMEREQUEST(cx, rc); - break; - } - JS_RESUMEREQUEST(cx, rc); - } - - *rval = OBJECT_TO_JSVAL(array); - return(JS_TRUE); -} - static JSBool js_trashcan(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { @@ -986,7 +922,6 @@ js_findstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) return(JS_TRUE); } - static JSBool js_zonestr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { @@ -1046,7 +981,6 @@ js_timestr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) return(JS_TRUE); } - /* Returns a mm/dd/yy or dd/mm/yy formated string */ static JSBool js_datestr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) @@ -1266,7 +1200,6 @@ js_get_node_message(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval return(JS_TRUE); } - static JSBool js_put_node_message(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { @@ -1603,11 +1536,6 @@ static jsSyncMethodSpec js_system_functions[] = { "or record at which to begin searching if optional <i>match_next</i> is <tt>true</tt>") ,310 }, - {"matchallusers", js_matchallusers, 2, JSTYPE_ARRAY, JSDOCSTR("field, data") - ,JSDOCSTR("search user database for data in a specific field (see <tt>U_*</tt> in <tt>sbbsdefs.js</tt>), " - "returns an array of matching user record numbers") - ,315 - }, {"trashcan", js_trashcan, 2, JSTYPE_BOOLEAN, JSDOCSTR("path/filename, find_string") ,JSDOCSTR("search text/filename.can for pseudo-regexp") ,310