[svn-commits] file: branch file/usecnt-cleanup r54036 - in /team/file/usecnt-cleanup: ./ co...

[svn-commits at lists.digium.com]

Author: file
Date: Mon Feb 12 11:06:40 2007
New Revision: 54036

URL: http://svn.digium.com/view/asterisk?view=rev&rev=54036
Log:
Merged revisions 53980,54003-54004,54035 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r53980 | tilghman | 2007-02-11 21:44:33 -0500 (Sun, 11 Feb 2007) | 2 lines

Formatting fixes

................
r54003 | russell | 2007-02-12 10:40:23 -0500 (Mon, 12 Feb 2007) | 2 lines

Simplify a small bit of logic.

................
r54004 | russell | 2007-02-12 10:48:28 -0500 (Mon, 12 Feb 2007) | 10 lines

Merged revisions 54002 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r54002 | russell | 2007-02-12 10:38:39 -0500 (Mon, 12 Feb 2007) | 2 lines

Fix a typo where "vmpassword" should be "vmsecret"

........

................
r54035 | file | 2007-02-12 11:40:54 -0500 (Mon, 12 Feb 2007) | 9 lines

Blocked revisions 54026 via svnmerge

........
r54026 | file | 2007-02-12 11:34:45 -0500 (Mon, 12 Feb 2007) | 2 lines

Make the --without-oss argument work. (issue #9026 reported by puzzled)

........

................

Modified:
    team/file/usecnt-cleanup/   (props changed)
    team/file/usecnt-cleanup/configs/users.conf.sample
    team/file/usecnt-cleanup/funcs/func_realtime.c
    team/file/usecnt-cleanup/main/channel.c

Propchange: team/file/usecnt-cleanup/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/file/usecnt-cleanup/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/file/usecnt-cleanup/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/file/usecnt-cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Feb 12 11:06:40 2007
@@ -1,1 +1,1 @@
-/trunk:1-53972
+/trunk:1-54035

Modified: team/file/usecnt-cleanup/configs/users.conf.sample
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/configs/users.conf.sample?view=diff&rev=54036&r1=54035&r2=54036
==============================================================================
--- team/file/usecnt-cleanup/configs/users.conf.sample (original)
+++ team/file/usecnt-cleanup/configs/users.conf.sample Mon Feb 12 11:06:40 2007
@@ -65,7 +65,7 @@
 ;secret = 1234
 ;zapchan = 1
 ;hasvoicemail = yes
-;vmpassword = 1234
+;vmsecret = 1234
 ;hassip = yes
 ;hasiax = no
 ;hash323 = no

Modified: team/file/usecnt-cleanup/funcs/func_realtime.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/funcs/func_realtime.c?view=diff&rev=54036&r1=54035&r2=54036
==============================================================================
--- team/file/usecnt-cleanup/funcs/func_realtime.c (original)
+++ team/file/usecnt-cleanup/funcs/func_realtime.c Mon Feb 12 11:06:40 2007
@@ -58,7 +58,6 @@
 		AST_APP_ARG(delim1);
 		AST_APP_ARG(delim2);
 	);
-
 
 	if (ast_strlen_zero(data)) {
 		ast_log(LOG_WARNING, "Syntax: REALTIME(family|fieldmatch[|value[|delim1[|delim2]]]) - missing argument!\n");
@@ -138,18 +137,17 @@
 
 static int unload_module(void)
 {
-        int res = ast_custom_function_unregister(&realtime_function);
+	int res = ast_custom_function_unregister(&realtime_function);
 
 	ast_module_user_hangup_all();
 
-        return res;
+	return res;
 }
 
 static int load_module(void)
 {
         int res = ast_custom_function_register(&realtime_function, ast_module_info->self);
-
-        return res;
+	return res;
 }
 
 AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Read/Write values from a RealTime repository");

Modified: team/file/usecnt-cleanup/main/channel.c
URL: http://svn.digium.com/view/asterisk/team/file/usecnt-cleanup/main/channel.c?view=diff&rev=54036&r1=54035&r2=54036
==============================================================================
--- team/file/usecnt-cleanup/main/channel.c (original)
+++ team/file/usecnt-cleanup/main/channel.c Mon Feb 12 11:06:40 2007
@@ -2673,10 +2673,7 @@
 			/* and now put it through the regular translator */
 			f = (chan->writetrans) ? ast_translate(chan->writetrans, f, 0) : f;
 		}
-		if (f)
-			res = chan->tech->write(chan, f);
-		else
-			res = 0;
+		res = f ? chan->tech->write(chan, f) : 0;
 		break;
 	case AST_FRAME_NULL:
 	case AST_FRAME_IAX: