diff --git a/src/sbbs3/js_system.c b/src/sbbs3/js_system.c index 39e5e422b1fcc984cf836873709bb4fa9e00eb41..2d57f6e0f0374e6e1846ed20c2fb01ca701b12d9 100644 --- a/src/sbbs3/js_system.c +++ b/src/sbbs3/js_system.c @@ -583,10 +583,6 @@ js_findstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) char* fname; JSString* js_str; JSString* js_fname; - scfg_t* cfg; - - if((cfg=(scfg_t*)JS_GetPrivate(cx,obj))==NULL) - return(JS_FALSE); if((js_fname=JS_ValueToString(cx, argv[0]))==NULL) { *rval = BOOLEAN_TO_JSVAL(JS_FALSE); @@ -608,7 +604,7 @@ js_findstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) return(JS_TRUE); } - *rval = BOOLEAN_TO_JSVAL(findstr(cfg,str,fname)); // user args are reversed + *rval = BOOLEAN_TO_JSVAL(findstr(str,fname)); // user args are reversed return(JS_TRUE); } diff --git a/src/sbbs3/sbbs.h b/src/sbbs3/sbbs.h index f07215c0f0ef17dd135a31dbb4c7308cb60e1de2..ef057bfb44bc707d0c8faab39e6a426c728b8739 100644 --- a/src/sbbs3/sbbs.h +++ b/src/sbbs3/sbbs.h @@ -775,7 +775,7 @@ extern "C" { /* str_util.c */ DLLEXPORT void DLLCALL truncsp(char *str); /* Truncates white spaces off end of str */ DLLEXPORT char * DLLCALL ascii_str(uchar* str); - DLLEXPORT BOOL DLLCALL findstr(scfg_t* cfg, char *insearch, char *fname); + DLLEXPORT BOOL DLLCALL findstr(char *insearch, char *fname); DLLEXPORT BOOL DLLCALL trashcan(scfg_t* cfg, char *insearch, char *name); DLLEXPORT char * DLLCALL strip_exascii(char *str); DLLEXPORT char * DLLCALL prep_file_desc(char *str); diff --git a/src/sbbs3/str_util.c b/src/sbbs3/str_util.c index ba65e9fe7465470e1864879da30b96df3ab23096..3d82379f30381976c67f0222aa10cbec2c2f8d59 100644 --- a/src/sbbs3/str_util.c +++ b/src/sbbs3/str_util.c @@ -111,7 +111,7 @@ char* DLLCALL prep_file_desc(char *str) /****************************************************************************/ /* Pattern matching string search of 'insearchof' in 'fname'. */ /****************************************************************************/ -BOOL DLLCALL findstr(scfg_t* cfg, char* insearchof, char* fname) +BOOL DLLCALL findstr(char* insearchof, char* fname) { char* p; char str[128]; @@ -188,7 +188,7 @@ BOOL DLLCALL trashcan(scfg_t* cfg, char* insearchof, char* name) char fname[MAX_PATH+1]; sprintf(fname,"%s%s.can",cfg->text_dir,name); - return(findstr(cfg,insearchof,fname)); + return(findstr(insearchof,fname)); } /****************************************************************************/