From: George Joseph <george.joseph@fairview5.com>
Date: Mon, 29 Sep 2014 21:58:40 +0000 (+0000)
Subject: pjsip_cli: Suppress header print on error or no objects
X-Git-Tag: 12.7.0-rc1~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88fc849559bb9a58f9484557ae064a61545091bc;p=thirdparty%2Fasterisk.git

pjsip_cli: Suppress header print on error or no objects

If there's an error on the pjsip command line or there are no objects, don't
print the column headers.

ASTERISK-24350 #close
Reported-by: Brad Latus
Tested-by: George Joseph
Tested-by: Brad Latus

Review: https://reviewboard.asterisk.org/r/4025/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@424128 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_pjsip/pjsip_cli.c b/res/res_pjsip/pjsip_cli.c
index 17876024d7..0f0a67648f 100644
--- a/res/res_pjsip/pjsip_cli.c
+++ b/res/res_pjsip/pjsip_cli.c
@@ -198,21 +198,21 @@ char *ast_sip_cli_traverse_objects(struct ast_cli_entry *e, int cmd, struct ast_
 
 	if (is_container) {
 		if (!ao2_container_count(container)) {
-			dump_str_and_free(a->fd, context.output_buffer);
+			ast_free(context.output_buffer);
 			ast_cli(a->fd, "No objects found.\n\n");
 			return CLI_SUCCESS;
 		}
 		ao2_callback(container, OBJ_NODATA, formatter_entry->print_body, &context);
 	} else {
 		if (ast_strlen_zero(object_id)) {
-			dump_str_and_free(a->fd, context.output_buffer);
+			ast_free(context.output_buffer);
 			ast_cli(a->fd, "No object specified.\n");
 			return CLI_FAILURE;
 		}
 
 		object = formatter_entry->retrieve_by_id(object_id);
 		if (!object) {
-			dump_str_and_free(a->fd, context.output_buffer);
+			ast_free(context.output_buffer);
 			ast_cli(a->fd, "Unable to find object %s.\n\n", object_id);
 			return CLI_SUCCESS;
 		}