[Freeswitch-trunk] [GIT]FreeSWITCH branch master updated. git2svn-syncpoint-master-1674-g2d6161e

[git at svn.freeswitch.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FreeSWITCH".

The branch, master has been updated
       via  2d6161e889fdaf8b03608fefdd7ef480a56ddf8b (commit)
      from  e88b9639624cef4f35901146241f515730b3b118 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2d6161e889fdaf8b03608fefdd7ef480a56ddf8b
Author: Marc Olivier Chouinard <mochouinard at moctel.com>
Date:   Tue Feb 1 01:33:08 2011 -0500

    switch_xml: Fix a lock on reloadxml when stderr write is blocked.  Also remove an error parsing print since reason generated were wrong and duplicate.

diff --git a/src/switch_xml.c b/src/switch_xml.c
index fe6a199..964a769 100644
--- a/src/switch_xml.c
+++ b/src/switch_xml.c
@@ -1286,9 +1286,7 @@ static int preprocess_glob(const char *cwd, const char *pattern, int write_fd, i
 	}
 
 	if (glob(pattern, GLOB_NOCHECK, NULL, &glob_data) != 0) {
-		if (stderr) {
-			fprintf(stderr, "Error including %s\n", pattern);
-		}
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error including %s\n", pattern);
 		goto end;
 	}
 
@@ -1299,11 +1297,9 @@ static int preprocess_glob(const char *cwd, const char *pattern, int write_fd, i
 			*e = '\0';
 		}
 		if (preprocess(dir_path, glob_data.gl_pathv[n], write_fd, rlevel) < 0) {
-			const char *reason = strerror(errno);
 			if (rlevel > 100) {
-				reason = "Maximum recursion limit reached";
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error including %s (Maximum recursion limit reached)\n", pattern);
 			}
-			fprintf(stderr, "Error including %s (%s)\n", pattern, reason);
 		}
 		free(dir_path);
 	}

-----------------------------------------------------------------------

Summary of changes:
 src/switch_xml.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
FreeSWITCH