mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
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/ ........ Merged revisions 424128 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@424129 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user