[asterisk-commits] file: branch file/pimp_sip_location r381521 - /team/file/pimp_sip_location/res/

[SVN commits to the Asterisk project]

Author: file
Date: Thu Feb 14 18:20:44 2013
New Revision: 381521

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=381521
Log:
Clear up some cppcheck errors.

Modified:
    team/file/pimp_sip_location/res/res_sip_session.c

Modified: team/file/pimp_sip_location/res/res_sip_session.c
URL: http://svnview.digium.com/svn/asterisk/team/file/pimp_sip_location/res/res_sip_session.c?view=diff&rev=381521&r1=381520&r2=381521
==============================================================================
--- team/file/pimp_sip_location/res/res_sip_session.c (original)
+++ team/file/pimp_sip_location/res/res_sip_session.c Thu Feb 14 18:20:44 2013
@@ -251,7 +251,6 @@
 {
 	RAII_VAR(struct ast_datastore *, datastore, NULL, ao2_cleanup);
 	const char *uid_ptr = uid;
-	char uuid_buf[AST_UUID_STR_LEN];
 
 	if (!info) {
 		return NULL;
@@ -266,6 +265,7 @@
 	if (ast_strlen_zero(uid)) {
 		/* They didn't provide an ID so we'll provide one ourself */
 		struct ast_uuid *uuid = ast_uuid_generate();
+		char uuid_buf[AST_UUID_STR_LEN];
 		if (!uuid) {
 			return NULL;
 		}
@@ -657,11 +657,10 @@
 {
 	struct sip_session_leg *leg = obj;
 	struct sip_session_leg_end_details *details = arg;
-	pj_status_t status;
 	pjsip_tx_data *packet = NULL;
 
 	if ((leg->inv_session != details->inv_session) &&
-		((status = pjsip_inv_end_session(leg->inv_session, details->reason ? details->reason : 603, NULL, &packet)) == PJ_SUCCESS) && packet) {
+		(pjsip_inv_end_session(leg->inv_session, details->reason ? details->reason : 603, NULL, &packet) == PJ_SUCCESS) && packet) {
 		if (packet->msg->type == PJSIP_RESPONSE_MSG) {
 			ast_sip_session_send_response(details->session, packet);
 		} else {