From 780edcd09d1a8fa80e621e64af11421e5685316e Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 22 Aug 2006 00:56:27 +0000 Subject: [PATCH] optimizations git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2354 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- Makefile.in | 1 + build/buildlib.sh | 2 +- build/modmake.sh | 4 ++-- libs/mozilla.build.sh | 4 ++-- src/mod/languages/mod_spidermonkey/mod_spidermonkey.c | 6 +++--- src/mod/loggers/mod_syslog/mod_syslog.c | 2 +- src/switch_console.c | 4 ++-- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4d8b0efe8a..2b7307e0a2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1108,6 +1108,7 @@ modules: $(NAME) @if [ ! -f $(PWD)/modules.conf ] ; then cp $(PWD)/modules.conf.in $(PWD)/modules.conf ; fi @echo making modules @rm -f build/freeswitch.env + @if [ -f $(PWD)/modbuild.env ] ; then cp $(PWD)/modbuild.env build/freeswitch.env ; fi @./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)" @./build/addenv.sh build/freeswitch.env DYLD_LIBRARY_PATH "$(PREFIX)/lib:$DYLD_LIBRARY_PATH" @./build/addenv.sh build/freeswitch.env LD_LIBRARY_PATH "$(PREFIX)/lib:$LD_LIBRARY_PATH" diff --git a/build/buildlib.sh b/build/buildlib.sh index 8991ff5ada..da889b918d 100755 --- a/build/buildlib.sh +++ b/build/buildlib.sh @@ -67,7 +67,7 @@ if [ -f ../$uncompressed.build.sh ] ; then MAKE=$MAKE ../$uncompressed.build.sh $@ else $MAKE clean 2>&1 - sh ./configure $@ + sh CFLAGS=$MOD_CFLAGS ./configure $@ if [ $? = 0 ] ; then $MAKE diff --git a/build/modmake.sh b/build/modmake.sh index c7efb91af2..3a93b9eea7 100755 --- a/build/modmake.sh +++ b/build/modmake.sh @@ -20,8 +20,8 @@ if [ -z $end ] ; then fi if [ -f $mod/Makefile ] ; then - MODNAME=$end $make -C $mod $@ + CFLAGS="$MOD_CFLAGS $CFLAGS " MODNAME=$end $make -C $mod $@ else - MODNAME=$end $make -f $pwd/generic_mod.mk -C $mod $@ + CFLAGS="$MOD_CFLAGS $CFLAGS" MODNAME=$end $make -f $pwd/generic_mod.mk -C $mod $@ fi diff --git a/libs/mozilla.build.sh b/libs/mozilla.build.sh index 1f3c03bb71..fbbd10a63b 100755 --- a/libs/mozilla.build.sh +++ b/libs/mozilla.build.sh @@ -5,7 +5,7 @@ if [ $arch = "x86_64" ] ; then opts="--enable-64bit" fi -cd nsprpub && ./configure $opts && make +cd nsprpub && ./configure $opts && $MAKE -cd ../js/src && JS_THREADSAFE=1 OTHER_LIBS="-L../../../mozilla/nsprpub/dist/lib" INCLUDES="-I../../../mozilla/nsprpub/dist/include/nspr" make -f Makefile.ref `find . -name libjs.a` +cd ../js/src && JS_THREADSAFE=1 JS_HAS_FILE_OBJECT=1 OTHER_LIBS="-L../../../mozilla/nsprpub/dist/lib" INCLUDES="-I../../../mozilla/nsprpub/dist/include/nspr" $MAKE -f Makefile.ref `find . -name libjs.a` diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c index 0bc8ce5be2..e664676780 100644 --- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c +++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c @@ -456,7 +456,7 @@ static switch_status_t js_stream_dtmf_callback(switch_core_session_t *session, v for(d = dtmf; *d; d++) { cb_state->ret_buffer[cb_state->ret_buffer_len++] = *d; if ((cb_state->ret_buffer_len > cb_state->digit_count)|| - (cb_state->ret_buffer_len > sizeof(cb_state->ret_buffer))|| + (cb_state->ret_buffer_len > (int32_t) sizeof(cb_state->ret_buffer))|| (cb_state->ret_buffer_len >= cb_state->digit_count) ) { return SWITCH_STATUS_FALSE; @@ -573,7 +573,7 @@ static switch_status_t js_record_dtmf_callback(switch_core_session_t *session, v for(d = dtmf; *d; d++) { cb_state->ret_buffer[cb_state->ret_buffer_len++] = *d; if ((cb_state->ret_buffer_len > cb_state->digit_count)|| - (cb_state->ret_buffer_len > sizeof(cb_state->ret_buffer))|| + (cb_state->ret_buffer_len > (int32_t) sizeof(cb_state->ret_buffer))|| (cb_state->ret_buffer_len >= cb_state->digit_count) ) { return SWITCH_STATUS_FALSE; @@ -642,7 +642,7 @@ static switch_status_t js_speak_dtmf_callback(switch_core_session_t *session, vo for(d = dtmf; *d; d++) { cb_state->ret_buffer[cb_state->ret_buffer_len++] = *d; if ((cb_state->ret_buffer_len > cb_state->digit_count)|| - (cb_state->ret_buffer_len > sizeof(cb_state->ret_buffer))|| + (cb_state->ret_buffer_len > (int32_t) sizeof(cb_state->ret_buffer))|| (cb_state->ret_buffer_len >= cb_state->digit_count) ) { return SWITCH_STATUS_FALSE; diff --git a/src/mod/loggers/mod_syslog/mod_syslog.c b/src/mod/loggers/mod_syslog/mod_syslog.c index cc4fc2a1d4..82a0045174 100644 --- a/src/mod/loggers/mod_syslog/mod_syslog.c +++ b/src/mod/loggers/mod_syslog/mod_syslog.c @@ -105,8 +105,8 @@ static switch_status_t mod_syslog_logger(const switch_log_node_t *node, switch_l SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **interface, char *filename) { - *interface = &console_module_interface; switch_status_t status; + *interface = &console_module_interface; if ((status=load_config()) != SWITCH_STATUS_SUCCESS) { return status; diff --git a/src/switch_console.c b/src/switch_console.c index 96d97ce211..9ffa796387 100644 --- a/src/switch_console.c +++ b/src/switch_console.c @@ -176,9 +176,9 @@ SWITCH_DECLARE(void) switch_console_loop(void) { char hostname[256]; char cmd[2048]; - int running = 1, x = 0, activity = 1; + int running = 1, activity = 1; char *retbuf = (char *)malloc(CMD_BUFLEN); - + switch_size_t x = 0; assert(retbuf != NULL); gethostname(hostname, sizeof(hostname));