[asterisk-commits] res pjsip pubsub.c: Fix incorrect message string wrapping. (asterisk[14])

[SVN commits to the Asterisk project]

George Joseph has submitted this change and it was merged. ( https://gerrit.asterisk.org/4740 )

Change subject: res_pjsip_pubsub.c: Fix incorrect message string wrapping.
......................................................................


res_pjsip_pubsub.c: Fix incorrect message string wrapping.

Change-Id: Id771e6fe56d89ce365ddcbb423f820af97211120
---
M res/res_pjsip_pubsub.c
1 file changed, 6 insertions(+), 5 deletions(-)

Approvals:
  George Joseph: Looks good to me, approved
  Anonymous Coward #1000019: Verified
  Joshua Colp: Looks good to me, but someone else must approve



diff --git a/res/res_pjsip_pubsub.c b/res/res_pjsip_pubsub.c
index 43a9d4b..0ec3443 100644
--- a/res/res_pjsip_pubsub.c
+++ b/res/res_pjsip_pubsub.c
@@ -889,8 +889,9 @@
 			if (PJSIP_IS_STATUS_IN_CLASS(resp, 200)) {
 				current = tree_node_alloc(resource, visited, 0);
 				if (!current) {
-					ast_debug(1, "Subscription to leaf resource %s was successful, but encountered"
-							"allocation error afterwards\n", resource);
+					ast_debug(1,
+						"Subscription to leaf resource %s was successful, but encountered allocation error afterwards\n",
+						resource);
 					continue;
 				}
 				ast_debug(2, "Subscription to leaf resource %s resulted in success. Adding to parent %s\n",
@@ -2565,8 +2566,9 @@
 
 	existing = find_sub_handler_for_event_name(handler->event_name);
 	if (existing) {
-		ast_log(LOG_ERROR, "Unable to register subscription handler for event %s."
-				"A handler is already registered\n", handler->event_name);
+		ast_log(LOG_ERROR,
+			"Unable to register subscription handler for event %s.  A handler is already registered\n",
+			handler->event_name);
 		return -1;
 	}
 
@@ -2764,7 +2766,6 @@
 	AST_SIP_USER_OPTIONS_TRUNCATE_CHECK(resource);
 
 	expires_header = pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_EXPIRES, rdata->msg_info.msg->hdr.next);
-
 	if (expires_header) {
 		if (expires_header->ivalue == 0) {
 			ast_log(LOG_WARNING, "Subscription request from endpoint %s rejected. Expiration of 0 is invalid\n",

-- 
To view, visit https://gerrit.asterisk.org/4740
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id771e6fe56d89ce365ddcbb423f820af97211120
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 14
Gerrit-Owner: Richard Mudgett <rmudgett at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>