[Freeswitch-svn] [commit] r4004 - in freeswitch/trunk: libs/iksemel/include libs/iksemel/src libs/iksemel/test scripts/js_modules src/mod/languages/mod_spidermonkey

Freeswitch SVN anthm at freeswitch.org
Fri Jan 19 16:56:32 EST 2007


Author: anthm
Date: Fri Jan 19 16:56:31 2007
New Revision: 4004

Modified:
   freeswitch/trunk/libs/iksemel/include/Makefile.in
   freeswitch/trunk/libs/iksemel/src/Makefile.in
   freeswitch/trunk/libs/iksemel/test/Makefile.in
   freeswitch/trunk/scripts/js_modules/SpeechTools.jm
   freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c

Log:
update

Modified: freeswitch/trunk/libs/iksemel/include/Makefile.in
==============================================================================
--- freeswitch/trunk/libs/iksemel/include/Makefile.in	(original)
+++ freeswitch/trunk/libs/iksemel/include/Makefile.in	Fri Jan 19 16:56:31 2007
@@ -100,7 +100,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
@@ -173,7 +173,7 @@
 	  awk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 

Modified: freeswitch/trunk/libs/iksemel/src/Makefile.in
==============================================================================
--- freeswitch/trunk/libs/iksemel/src/Makefile.in	(original)
+++ freeswitch/trunk/libs/iksemel/src/Makefile.in	Fri Jan 19 16:56:31 2007
@@ -92,9 +92,21 @@
 
 lib_LTLIBRARIES = libiksemel.la
 
- at DO_POSIX_TRUE@posix_c = io-posix.c
+ at DO_POSIX_TRUE@posix_c = @DO_POSIX_TRUE at io-posix.c
 
-libiksemel_la_SOURCES =  	ikstack.c 	utility.c 	iks.c 	sax.c 	dom.c 	$(posix_c) 	stream.c 	sha.c 	jabber.c 	filter.c 	md5.c 	base64.c
+libiksemel_la_SOURCES = \
+	ikstack.c \
+	utility.c \
+	iks.c \
+	sax.c \
+	dom.c \
+	$(posix_c) \
+	stream.c \
+	sha.c \
+	jabber.c \
+	filter.c \
+	md5.c \
+	base64.c
 
 
 libiksemel_la_LDFLAGS = -version-info 3:0:0 -no-undefined
@@ -127,7 +139,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(libiksemel_la_SOURCES)
 OBJECTS = $(libiksemel_la_OBJECTS)
@@ -233,7 +245,7 @@
 	  awk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 

Modified: freeswitch/trunk/libs/iksemel/test/Makefile.in
==============================================================================
--- freeswitch/trunk/libs/iksemel/test/Makefile.in	(original)
+++ freeswitch/trunk/libs/iksemel/test/Makefile.in	Fri Jan 19 16:56:31 2007
@@ -164,7 +164,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(tst_ikstack_SOURCES) $(tst_iks_SOURCES) $(tst_sax_SOURCES) $(tst_dom_SOURCES) $(tst_sha_SOURCES) $(tst_md5_SOURCES) $(tst_filter_SOURCES) $(tst_jid_SOURCES)
 OBJECTS = $(tst_ikstack_OBJECTS) $(tst_iks_OBJECTS) $(tst_sax_OBJECTS) $(tst_dom_OBJECTS) $(tst_sha_OBJECTS) $(tst_md5_OBJECTS) $(tst_filter_OBJECTS) $(tst_jid_OBJECTS)
@@ -283,7 +283,7 @@
 	  awk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 

Modified: freeswitch/trunk/scripts/js_modules/SpeechTools.jm
==============================================================================
--- freeswitch/trunk/scripts/js_modules/SpeechTools.jm	(original)
+++ freeswitch/trunk/scripts/js_modules/SpeechTools.jm	Fri Jan 19 16:56:31 2007
@@ -311,7 +311,7 @@
 			if (!files[x] || files[x] == "noop") {
 				continue;
 			}
-			rv = this.asr.session.streamFile(this.audio_base + files[x] + this.audio_ext , "", this.asr.onInput, this.asr);
+			rv = this.asr.session.streamFile(this.audio_base + files[x] + this.audio_ext , this.asr.onInput, this.asr);
 			if (rv) {
 				break;
 			}

Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c	(original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c	Fri Jan 19 16:56:31 2007
@@ -402,11 +402,36 @@
 
 static void js_error(JSContext *cx, const char *message, JSErrorReport *report)
 {
-	if (message) {
-		switch_log_printf(SWITCH_CHANNEL_ID_LOG, report->filename ? (char *)report->filename : "mod_spidermonkey.c", modname, report->lineno, SWITCH_LOG_ERROR,
-						  "%s %s%s\n", message, report->linebuf ? "near " : "", report->linebuf ? report->linebuf : "");
+    const char *filename = __FILE__;
+    int line = __LINE__;
+    const char *text = "";
+    char *ex = "";
+    
+	if (message && report) {
+        if (report->filename) {
+            filename = report->filename;
+        }
+        line = report->lineno;
+        if (report->linebuf) {
+            text = report->linebuf;
+            ex = "near ";
+        }
 	}
-	
+    
+    if (!message) {
+        message = "(N/A)";
+    }
+    
+    switch_log_printf(SWITCH_CHANNEL_ID_LOG, 
+                      filename,
+                      modname,
+                      line,
+                      SWITCH_LOG_ERROR,
+                      "%s %s%s\n",
+                      ex,
+                      message,
+                      text);
+
 }
 
 



More information about the Freeswitch-svn mailing list