[Freeswitch-svn] [commit] r11883 - in freeswitch/trunk/src/mod/applications: mod_fax mod_lcr mod_rss

[FreeSWITCH SVN]

Author: mikej
Date: Wed Feb 11 12:08:04 2009
New Revision: 11883

Log:
fix windows build errors (MODAPP-212, FSBUILD-116, FSBUILD-117)

Modified:
   freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c
   freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c
   freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c

Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c	Wed Feb 11 12:08:04 2009
@@ -403,8 +403,8 @@
 	switch_frame_t *read_frame = { 0 };
 	switch_frame_t write_frame = { 0 };
     switch_codec_implementation_t read_impl = {0};
-    switch_core_session_get_read_impl(session, &read_impl);
 	int16_t *buf = NULL;
+    switch_core_session_get_read_impl(session, &read_impl);
 
 	/* make sure we have a valid channel when starting the FAX application */
 	channel = switch_core_session_get_channel(session);

Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c	Wed Feb 11 12:08:04 2009
@@ -242,8 +242,8 @@
 static switch_bool_t test_lcr_sql(const char *sql)
 {
 	char * tsql;
-	tsql = switch_mprintf(sql, "5555551212");
 	switch_bool_t retval = SWITCH_FALSE;
+	tsql = switch_mprintf(sql, "5555551212");
 	
 	if (globals.odbc_dsn) {
 		if(switch_odbc_handle_exec(globals.master_odbc, tsql, NULL)
@@ -839,6 +839,7 @@
 		if(argc < 2) {
 			goto usage;
 		}
+		switch_assert(argv[0]);
 		if(!strcasecmp(argv[0], "show") && !strcasecmp(argv[1], "profiles")) {
 			for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) {
 				switch_hash_this(hi, NULL, NULL, &val);

Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c	Wed Feb 11 12:08:04 2009
@@ -185,8 +185,9 @@
 	const char *vcf = NULL;
 	char *chanvars = switch_channel_build_param_string(channel, NULL, NULL);
 	switch_codec_implementation_t read_impl = {0};
+	uint32_t rate, interval;
     switch_core_session_get_read_impl(session, &read_impl);
-	uint32_t rate, interval = read_impl.microseconds_per_packet / 1000;
+	interval = read_impl.microseconds_per_packet / 1000;
 
 	if ((vcf = switch_channel_get_variable(channel, "rss_alt_config"))) {
 		cf = vcf;