kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

make snprintf commands use the path seperator macro. 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1544 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2006-06-05 18:12:33 +00:00
parent 7c7c42a6bf
commit e9563fbf5d
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
View File

@ -2003,7 +2003,7 @@ static int eval_some_js(char *code, JSContext *cx, JSObject *obj, jsval *rval)
if (code[0] == '/') { if (code[0] == '/') {
script = JS_CompileFile(cx, obj, code); script = JS_CompileFile(cx, obj, code);
} else { } else {
snprintf(path, sizeof(path), "%s/%s", SWITCH_GLOBAL_dirs.script_dir, code); snprintf(path, sizeof(path), "%s%s%s", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR, code);
script = JS_CompileFile(cx, obj, path); script = JS_CompileFile(cx, obj, path);
} }
} }

2
src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c
View File

@ -323,7 +323,7 @@ SWITCH_MOD_DECLARE(switch_status_t) switch_module_runtime(void)
MIMETypeInit(); MIMETypeInit();
MIMETypeAdd("text/html", "html"); MIMETypeAdd("text/html", "html");
snprintf(logfile, sizeof(logfile), "%s/%s", SWITCH_GLOBAL_dirs.log_dir, "freeswitch_http.log"); snprintf(logfile, sizeof(logfile), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, "freeswitch_http.log");
ServerCreate(&abyssServer, "XmlRpcServer", globals.port, SWITCH_GLOBAL_dirs.htdocs_dir, logfile); ServerCreate(&abyssServer, "XmlRpcServer", globals.port, SWITCH_GLOBAL_dirs.htdocs_dir, logfile);
xmlrpc_server_abyss_set_handler(&env, &abyssServer, "/RPC2", registryP); xmlrpc_server_abyss_set_handler(&env, &abyssServer, "/RPC2", registryP);

4
src/switch_config.c
View File

@ -41,7 +41,7 @@ SWITCH_DECLARE(int) switch_config_open_file(switch_config_t *cfg, char *file_pat
if (file_path[0] == '/') { if (file_path[0] == '/') {
path = file_path; path = file_path;
} else { } else {
snprintf(path_buf, sizeof(path_buf), "%s/%s", SWITCH_GLOBAL_dirs.conf_dir, file_path); snprintf(path_buf, sizeof(path_buf), "%s%s%s", SWITCH_GLOBAL_dirs.conf_dir, SWITCH_PATH_SEPARATOR, file_path);
path = path_buf; path = path_buf;
} }
@ -57,7 +57,7 @@ SWITCH_DECLARE(int) switch_config_open_file(switch_config_t *cfg, char *file_pat
int last = -1; int last = -1;
char *var, *val; char *var, *val;
snprintf(path_buf, sizeof(path_buf), "%s/freeswitch.conf", SWITCH_GLOBAL_dirs.conf_dir); snprintf(path_buf, sizeof(path_buf), "%s%sfreeswitch.conf", SWITCH_GLOBAL_dirs.conf_dir, SWITCH_PATH_SEPARATOR);
path = path_buf; path = path_buf;
if ((f = fopen(path, "r")) == 0) { if ((f = fopen(path, "r")) == 0) {

2
src/switch_core.c
View File

@ -117,7 +117,7 @@ static void db_pick_path(char *dbname, char *buf, switch_size_t size)
if (strchr(dbname, '/')) { if (strchr(dbname, '/')) {
strncpy(buf, dbname, size); strncpy(buf, dbname, size);
} else { } else {
snprintf(buf, size, "%s/%s.db", SWITCH_DB_DIR, dbname); snprintf(buf, size, "%s%s%s.db", SWITCH_DB_DIR, SWITCH_PATH_SEPARATOR, dbname);
} }
} }

2
src/switch_xml.c
View File

@ -900,7 +900,7 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_open_root(uint8_t reload, const char **e
switch_xml_free(xml); switch_xml_free(xml);
} }
snprintf(path_buf, sizeof(path_buf), "%s/%s", SWITCH_GLOBAL_dirs.conf_dir, "freeswitch.xml"); snprintf(path_buf, sizeof(path_buf), "%s%s%s", SWITCH_GLOBAL_dirs.conf_dir, SWITCH_PATH_SEPARATOR, "freeswitch.xml");
if ((MAIN_XML_ROOT = switch_xml_parse_file(path_buf))) { if ((MAIN_XML_ROOT = switch_xml_parse_file(path_buf))) {
*err = switch_xml_error(MAIN_XML_ROOT); *err = switch_xml_error(MAIN_XML_ROOT);