[svn-commits] murf: branch murf/bug11210 r104100 - in /team/murf/bug11210: ./ channels/ res/

[SVN commits to the Digium repositories]

Author: murf
Date: Mon Feb 25 16:54:49 2008
New Revision: 104100

URL: http://svn.digium.com/view/asterisk?view=rev&rev=104100
Log:
Merged revisions 104073-104074 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r104073 | murf | 2008-02-23 17:44:14 -0700 (Sat, 23 Feb 2008) | 1 line

On a 64-bit machine, with dev-mode turned on, and pgsql installed, I get warnings that stops the compile. They are fixed now.
........
r104074 | murf | 2008-02-23 19:37:08 -0700 (Sat, 23 Feb 2008) | 1 line

Enforce a space between function args as per code review.
........

Modified:
    team/murf/bug11210/   (props changed)
    team/murf/bug11210/channels/chan_sip.c
    team/murf/bug11210/res/res_config_pgsql.c

Propchange: team/murf/bug11210/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Feb 25 16:54:49 2008
@@ -1,1 +1,1 @@
-/trunk:1-104066
+/trunk:1-104075

Modified: team/murf/bug11210/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug11210/channels/chan_sip.c?view=diff&rev=104100&r1=104099&r2=104100
==============================================================================
--- team/murf/bug11210/channels/chan_sip.c (original)
+++ team/murf/bug11210/channels/chan_sip.c Mon Feb 25 16:54:49 2008
@@ -4004,6 +4004,7 @@
 		ast_set_flag(&user->flags[1], SIP_PAGE2_RTCACHEFRIENDS);
 		ast_atomic_fetchadd_int(&suserobjs, 1);
 		ao2_t_link(users, user, "link user into users table");
+	} else {
 		/* Move counter from s to r... */
 		ast_atomic_fetchadd_int(&suserobjs, -1);
 		ast_atomic_fetchadd_int(&ruserobjs, 1);
@@ -4344,7 +4345,7 @@
 
 	/* Check whether there is vxml_url, distinctive ring variables */
 	headp=&ast->varshead;
-	AST_LIST_TRAVERSE(headp,current,entries) {
+	AST_LIST_TRAVERSE(headp, current, entries) {
 		/* Check whether there is a VXML_URL variable */
 		if (!p->options->vxml_url && !strcasecmp(ast_var_name(current), "VXML_URL")) {
 			p->options->vxml_url = ast_var_value(current);

Modified: team/murf/bug11210/res/res_config_pgsql.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug11210/res/res_config_pgsql.c?view=diff&rev=104100&r1=104099&r2=104100
==============================================================================
--- team/murf/bug11210/res/res_config_pgsql.c (original)
+++ team/murf/bug11210/res/res_config_pgsql.c Mon Feb 25 16:54:49 2008
@@ -913,7 +913,7 @@
 	}
 
 	/* DB password can legitimately be 0-length */
-	if ((!pgsqlConn) && (!ast_strlen_zero(dbhost) || !ast_strlen_zero(dbsock)) && !ast_strlen_zero(dbuser) && dbpass && !ast_strlen_zero(my_database)) {
+	if ((!pgsqlConn) && (!ast_strlen_zero(dbhost) || !ast_strlen_zero(dbsock)) && !ast_strlen_zero(dbuser) && !ast_strlen_zero(my_database)) {
 		struct ast_str *connInfo = ast_str_create(32);
 
 		ast_str_set(&connInfo, 0, "host=%s port=%d dbname=%s user=%s",
@@ -921,9 +921,9 @@
 		if (!ast_strlen_zero(dbpass))
 			ast_str_append(&connInfo, 0, " password=%s", dbpass);
 
-		ast_debug(1, "%u connInfo=%s\n", connInfo->len, connInfo->str);
+		ast_debug(1, "%u connInfo=%s\n", (unsigned int)connInfo->len, connInfo->str);
 		pgsqlConn = PQconnectdb(connInfo->str);
-		ast_debug(1, "%u connInfo=%s\n", connInfo->len, connInfo->str);
+		ast_debug(1, "%u connInfo=%s\n", (unsigned int)connInfo->len, connInfo->str);
 		ast_free(connInfo);
 		connInfo = NULL;