pjsip_cli: Suppress header print on error or no objects
authorGeorge Joseph <george.joseph@fairview5.com>
Mon, 29 Sep 2014 22:00:38 +0000 (22:00 +0000)
committerGeorge Joseph <george.joseph@fairview5.com>
Mon, 29 Sep 2014 22:00:38 +0000 (22:00 +0000)
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/
........

Merged revisions 424128 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 424129 from http://svn.asterisk.org/svn/asterisk/branches/13

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

res/res_pjsip/pjsip_cli.c

index 1787602..0f0a676 100644 (file)
@@ -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;
                }