- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4651 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 19 Mar '07

19 Mar '07

Author: mikej Date: Sun Mar 18 20:41:23 2007 New Revision: 4651 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: null format string error Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Sun Mar 18 20:41:23 2007 @@ -475,7 +475,7 @@ switch_xml_t xml; etype = "xml"; - if ((xml = switch_event_xmlize(event, NULL))) { + if ((xml = switch_event_xmlize(event, "%s", ""))) { listener->ebuf = switch_xml_toxml(xml); switch_xml_free(xml); } else {

1 0

[commit] r4650 - freeswitch/trunk/src
by Freeswitch SVN 19 Mar '07

19 Mar '07

Author: mikej Date: Sun Mar 18 20:33:54 2007 New Revision: 4650 Modified: freeswitch/trunk/src/switch.c Log: fix freebsd build Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Sun Mar 18 20:33:54 2007 @@ -34,7 +34,7 @@ */ #ifndef _XOPEN_SOURCE -#define _XOPEN_SOURCE 500 +#define _XOPEN_SOURCE 600 #endif #include <switch.h>

1 0

[commit] r4649 - freeswitch/trunk/build
by Freeswitch SVN 18 Mar '07

18 Mar '07

Author: mikej Date: Sun Mar 18 19:20:30 2007 New Revision: 4649 Modified: freeswitch/trunk/build/modmake.rules.in Log: add custom build output on modules install Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Sun Mar 18 19:20:30 2007 @@ -120,7 +120,8 @@ mod_install: $(DESTDIR)$(PREFIX)/mod/$(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod/$(MODNAME).$(DYNAMIC_LIB_EXTEN):$(MODNAME).$(DYNAMIC_LIB_EXTEN) - @$(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod + @echo installing $< + @$(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod >/dev/null mod_uninstall: @$(LTUNINSTALL) $(DESTDIR)$(PREFIX)/mod/$(MODNAME).$(DYNAMIC_LIB_EXTEN)

1 0

[commit] r4647 - freeswitch/trunk
by Freeswitch SVN 18 Mar '07

18 Mar '07

Author: mikej Date: Sun Mar 18 13:38:48 2007 New Revision: 4647 Modified: freeswitch/trunk/configure freeswitch/trunk/configure.in Log: add back -Werror for gcc builds Modified: freeswitch/trunk/configure ============================================================================== --- freeswitch/trunk/configure (original) +++ freeswitch/trunk/configure Sun Mar 18 13:38:48 2007 @@ -20218,6 +20218,27 @@ done fi + + if test "x$SWITCH_AM_CFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting SWITCH_AM_CFLAGS to \"-Werror\"" + SWITCH_AM_CFLAGS="-Werror" + else + apr_addto_bugger="-Werror" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $SWITCH_AM_CFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to SWITCH_AM_CFLAGS" + SWITCH_AM_CFLAGS="$SWITCH_AM_CFLAGS $i" + fi + done + fi + fi # tweak platform specific flags Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Sun Mar 18 13:38:48 2007 @@ -100,6 +100,7 @@ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC) APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC) + APR_ADDTO(SWITCH_AM_CFLAGS, -Werror) fi # tweak platform specific flags

1 0

[commit] r4646 - freeswitch/trunk/src/mod/asr_tts/mod_cepstral
by Freeswitch SVN 18 Mar '07

18 Mar '07

Author: mikej Date: Sun Mar 18 13:32:50 2007 New Revision: 4646 Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile Log: supress warnings due to non compilant headers Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile Sun Mar 18 13:32:50 2007 @@ -1,6 +1,6 @@ LOCAL_INSERT_LDFLAGS=if test $$osarch = "Darwin" ; then echo "-framework swift" ; else echo "-L/opt/swift/lib -lswift -lceplex_us -lceplang_en -lm" ; fi ; LOCAL_INSERT_CFLAGS=test $$osarch = "Darwin" || echo "-I/opt/swift/include"; - +LOCAL_CFLAGS=-w include ../../../../build/modmake.rules

1 0

[commit] r4645 - freeswitch/trunk/libs/portaudio
by Freeswitch SVN 18 Mar '07

18 Mar '07

Author: mikej Date: Sun Mar 18 13:28:59 2007 New Revision: 4645 Modified: freeswitch/trunk/libs/portaudio/Makefile.in Log: make makefile more bsd make friendly Modified: freeswitch/trunk/libs/portaudio/Makefile.in ============================================================================== --- freeswitch/trunk/libs/portaudio/Makefile.in (original) +++ freeswitch/trunk/libs/portaudio/Makefile.in Sun Mar 18 13:28:59 2007 @@ -164,16 +164,19 @@ distclean: clean rm -f config.log config.status Makefile libtool portaudio-2.0.pc -%.o: %.c $(MAKEFILE) $(PAINC) +.SUFFIXES: +.SUFFIXES: .c .lo .o .cpp + +.c.o: $(MAKEFILE) $(PAINC) $(CC) -c $(CFLAGS) $< -o $@ -%.lo: %.c $(MAKEFILE) $(PAINC) +.c.lo: $(MAKEFILE) $(PAINC) $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< -o $@ -%.o: %.cpp $(MAKEFILE) $(PAINC) +.cpp.o: $(MAKEFILE) $(PAINC) $(CXX) -c $(CXXFLAGS) $< -o $@ -%.o: %.asm +.asm.o: $(NASM) $(NASMOPT) -o $@ $< bin-stamp:

1 0

[commit] r4644 - freeswitch/trunk/src/mod/asr_tts/mod_cepstral
by Freeswitch SVN 18 Mar '07

18 Mar '07

Author: mikej Date: Sun Mar 18 13:15:29 2007 New Revision: 4644 Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Log: resolve a few little warnings Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Sun Mar 18 13:15:29 2007 @@ -48,6 +48,9 @@ #define MY_BUF_LEN 1024 * 32 #define MY_BLOCK_SIZE MY_BUF_LEN +#undef SWIFT_FAILED +#define SWIFT_FAILED(r) ((void *)(r) < (void *)0) + static const char modname[] = "mod_cepstral"; static swift_engine *engine;

1 0

[commit] r4643 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 18 Mar '07

18 Mar '07

Author: mikej Date: Sun Mar 18 13:15:00 2007 New Revision: 4643 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile Log: bsd make tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile Sun Mar 18 13:15:00 2007 @@ -3,12 +3,13 @@ PA_DIR=$(BASE)/libs/portaudio PALA=$(PA_DIR)/lib/libportaudio.la -LOCAL_CFLAGS=-I. -I$(PA_DIR)/include +LOCAL_CFLAGS=-I. -I$(PA_DIR)/include -D__EXTENSION__=1 LOCAL_INSERT_LDFLAGS=if test $$osarch = "Darwin" ; then echo "-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon" ; fi ; LOCAL_LIBADD=$(PALA) LOCAL_OBJS=pablio.o pa_ringbuffer.o +LOCAL_SOURCES=pablio.c pa_ringbuffer.c include $(BASE)/build/modmake.rules @@ -16,7 +17,4 @@ cd $(PA_DIR) && $(MAKE) $(TOUCH_TARGET) -pa_ringbuffer.o: pa_ringbuffer.c - $(COMPILE) -D__EXTENSION__=1 -c -o $@ $< - -pablio.o: pablio.c +$(LOCAL_OBJS): $(LOCAL_SOURCES)

1 0

[commit] r4642 - in freeswitch/trunk: . build src/mod
by Freeswitch SVN 18 Mar '07

18 Mar '07

Author: mikej Date: Sun Mar 18 12:45:57 2007 New Revision: 4642 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/Makefile.in freeswitch/trunk/build/modmake.rules.in freeswitch/trunk/src/mod/Makefile.am freeswitch/trunk/src/mod/Makefile.in Log: use -s for make without chekc on if it's supported. If we run into ones that do not support -s, we can adress it at that point. Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Sun Mar 18 12:45:57 2007 @@ -13,7 +13,8 @@ LIBTOOL=$(switch_builddir)/libtool LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) TOUCH_TARGET=if test -f "$@" ; then touch "$@" ; fi ; -AM_MAKEFLAGS=`if test -z "$(VERBOSE)" ; then $(MAKE) --help | grep silent | grep "\-s" 2>&1 >/dev/null && echo -s;fi` +AM_MAKEFLAGS=`test -n "$(VERBOSE)" || echo -s` +#AM_MAKEFLAGS=`if test -z "$(VERBOSE)" ; then $(MAKE) --help | grep silent | grep "\-s" 2>&1 >/dev/null && echo -s;fi` if CRASHPROT AM_CFLAGS += -DCRASH_PROT Modified: freeswitch/trunk/Makefile.in ============================================================================== --- freeswitch/trunk/Makefile.in (original) +++ freeswitch/trunk/Makefile.in Sun Mar 18 12:45:57 2007 @@ -40,6 +40,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +#AM_MAKEFLAGS=`if test -z "$(VERBOSE)" ; then $(MAKE) --help | grep silent | grep "\-s" 2>&1 >/dev/null && echo -s;fi` @CRASHPROT_TRUE@am__append_1 = -DCRASH_PROT bin_PROGRAMS = freeswitch$(EXEEXT) DIST_COMMON = README $(am__configure_deps) $(library_include_HEADERS) \ @@ -300,7 +301,7 @@ OSARCH = `uname -s` LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) TOUCH_TARGET = if test -f "$@" ; then touch "$@" ; fi ; -AM_MAKEFLAGS = `if test -z "$(VERBOSE)" ; then $(MAKE) --help | grep silent | grep "\-s" 2>&1 >/dev/null && echo -s;fi` +AM_MAKEFLAGS = `test -n "$(VERBOSE)" || echo -s` libfreeswitch_la_SOURCES = \ src/switch_apr.c \ src/switch_buffer.c \ Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Sun Mar 18 12:45:57 2007 @@ -48,7 +48,8 @@ CXXSOURCEFILE=$(MODNAME).cpp TOUCH_TARGET=if test -f "$@" ; then touch "$@" ; fi ; -MAKE_OPTS = `if test -z "$(VERBOSE)" ; then $(MAKE) --help | grep silent | grep "\-s" 2>&1 >/dev/null && echo -s;fi` +#MAKE_OPTS = `if test -z "$(VERBOSE)" ; then $(MAKE) --help | grep silent | grep "\-s" 2>&1 >/dev/null && echo -s;fi` +MAKE_OPTS = `test -n "$(VERBOSE)" || echo -s` RECURSE_MODNAME=`pwd | sed -e 's|^.*/||'` RECURSE_SOURCEFILE=`if test -f $$modname.cpp; then echo $$modname.cpp; else echo $$modname.c; fi` RECURSE_OUR_DEPS=`test -z "$(WANT_CURL)" || if test ! -z "$(LIBCURL_DEPS)"; then echo $(CURLLA); fi` Modified: freeswitch/trunk/src/mod/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/Makefile.am (original) +++ freeswitch/trunk/src/mod/Makefile.am Sun Mar 18 12:45:57 2007 @@ -6,7 +6,8 @@ else our_clean_modules=$(MODULES) ; fi ; MOD_NAME=`echo $$i | sed -e 's|^.*/||'` MOD_DIR=`if test -d $(switch_srcdir)/src/mod/$$i ; then echo $(switch_srcdir)/src/mod/$$i ; else echo $$i ; fi;` -AM_MAKEFLAGS = `if test -z "$(VERBOSE)" ; then $(MAKE) --help | grep silent | grep "\-s" 2>&1 >/dev/null && echo -s;fi` +AM_MAKEFLAGS = `test -n "$(VERBOSE)" || echo -s` +#AM_MAKEFLAGS = `if test -z "$(VERBOSE)" ; then $(MAKE) --help | grep silent | grep "\-s" 2>&1 >/dev/null && echo -s;fi` all: @$(CONF_MODULES) \ Modified: freeswitch/trunk/src/mod/Makefile.in ============================================================================== --- freeswitch/trunk/src/mod/Makefile.in (original) +++ freeswitch/trunk/src/mod/Makefile.in Sun Mar 18 12:45:57 2007 @@ -201,7 +201,7 @@ MOD_NAME = `echo $$i | sed -e 's|^.*/||'` MOD_DIR = `if test -d $(switch_srcdir)/src/mod/$$i ; then echo $(switch_srcdir)/src/mod/$$i ; else echo $$i ; fi;` -AM_MAKEFLAGS = `if test -z "$(VERBOSE)" ; then $(MAKE) --help | grep silent | grep "\-s" 2>&1 >/dev/null && echo -s;fi` +AM_MAKEFLAGS = `test -n "$(VERBOSE)" || echo -s` all: all-am .SUFFIXES: @@ -358,6 +358,7 @@ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ uninstall-info-am +#AM_MAKEFLAGS = `if test -z "$(VERBOSE)" ; then $(MAKE) --help | grep silent | grep "\-s" 2>&1 >/dev/null && echo -s;fi` all: @$(CONF_MODULES) \

1 0

[commit] r4641 - in freeswitch/trunk/src: include mod/applications/mod_conference mod/applications/mod_skel mod/endpoints/mod_opal mod/languages/mod_spidermonkey_etpan mod/xml_int/mod_xml_curl
by Freeswitch SVN 18 Mar '07

18 Mar '07

Author: mikej Date: Sun Mar 18 12:40:01 2007 New Revision: 4641 Modified: freeswitch/trunk/src/include/switch_bitpack.h freeswitch/trunk/src/include/switch_private.h.in freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_skel/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_opal/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: fix some warnings Modified: freeswitch/trunk/src/include/switch_bitpack.h ============================================================================== --- freeswitch/trunk/src/include/switch_bitpack.h (original) +++ freeswitch/trunk/src/include/switch_bitpack.h Sun Mar 18 12:40:01 2007 @@ -63,8 +63,8 @@ \{ */ -static const int8_t SWITCH_BITPACKED_MASKS[] = {0, 1, 3, 7, 15, 31, 63, 127, 255}; -static const int8_t SWITCH_REVERSE_BITPACKED_MASKS[] = {255, 254, 252, 248, 240, 224, 192, 128}; +static const uint8_t SWITCH_BITPACKED_MASKS[] = {0, 1, 3, 7, 15, 31, 63, 127, 255}; +static const uint8_t SWITCH_REVERSE_BITPACKED_MASKS[] = {255, 254, 252, 248, 240, 224, 192, 128}; /*! \brief Initialize a bitpack object Modified: freeswitch/trunk/src/include/switch_private.h.in ============================================================================== --- freeswitch/trunk/src/include/switch_private.h.in (original) +++ freeswitch/trunk/src/include/switch_private.h.in Sun Mar 18 12:40:01 2007 @@ -7,6 +7,9 @@ */ #undef HAVE_DIRENT_H +/* Define to 1 if you have the <dlfcn.h> header file. */ +#undef HAVE_DLFCN_H + /* Define to 1 if you have the `gethostname' function. */ #undef HAVE_GETHOSTNAME Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Sun Mar 18 12:40:01 2007 @@ -522,7 +522,7 @@ if (conference->alone_sound) { conference_play_file(conference, conference->alone_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session), 0); } else { - snprintf(msg, sizeof(msg), "You are currently the only person in this conference.", conference->count); + snprintf(msg, sizeof(msg), "You are currently the only person in this conference."); conference_member_say(member, msg, CONF_DEFAULT_LEADIN); } } Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c Sun Mar 18 12:40:01 2007 @@ -62,10 +62,12 @@ { } +#if 0 static JSBool etpan_my_method(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { return JS_FALSE; } +#endif enum etpan_tinyid { etpan_NAME Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Sun Mar 18 12:40:01 2007 @@ -77,7 +77,7 @@ return NULL; } - if (file_url = strstr(binding->url, "file:")) { + if ((file_url = strstr(binding->url, "file:"))) { file_url += 5; if (!(xml = switch_xml_parse_file(file_url))) {

1 0