Synchronet now requires the libarchive development package (e.g. libarchive-dev on Debian-based Linux distros, libarchive.org for more info) to build successfully.

Commit 82f0e398 authored by rswindell's avatar rswindell

Removed unused scfg_t parameter from findstr() function.

parent 48a787c8
......@@ -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);
}
......
......@@ -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);
......
......@@ -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));
}
/****************************************************************************/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment