optimizations

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2354 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2006-08-22 00:56:27 +00:00
parent a0219008e9
commit 780edcd09d
7 changed files with 12 additions and 11 deletions

View File

@ -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"

View File

@ -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

View File

@ -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

View File

@ -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`

View File

@ -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;

View File

@ -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;

View File

@ -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));