Merge "pjsip: Improve CLI completion performance" into 15

1 files changed, 8 insertions, 16 deletions

diff --git a/res/res_pjsip/pjsip_cli.c b/res/res_pjsip/pjsip_cli.c
index 56ec191ed..4544a1717 100644
--- a/res/res_pjsip/pjsip_cli.c
+++ b/res/res_pjsip/pjsip_cli.c
@@ -82,31 +82,22 @@ int ast_sip_cli_print_sorcery_objectset(void *obj, void *arg, int flags)
 	return 0;
 }
 
-static char *complete_show_sorcery_object(struct ao2_container *container,
+static void complete_show_sorcery_object(struct ao2_container *container,
 	struct ast_sip_cli_formatter_entry *formatter_entry,
-	const char *word, int state)
+	const char *word)
 {
-	char *result = NULL;
-	int wordlen = strlen(word);
-	int which = 0;
-
-	struct ao2_iterator i = ao2_iterator_init(container, 0);
+	size_t wordlen = strlen(word);
 	void *object;
+	struct ao2_iterator i = ao2_iterator_init(container, 0);
 
 	while ((object = ao2_t_iterator_next(&i, "iterate thru endpoints table"))) {
 		const char *id = formatter_entry->get_id(object);
-		if (!strncasecmp(word, id, wordlen)
-			&& ++which > state) {
-			result = ast_strdup(id);
+		if (!strncasecmp(word, id, wordlen)) {
+			ast_cli_completion_add(ast_strdup(id));
 		}
 		ao2_t_ref(object, -1, "toss iterator endpoint ptr before break");
-		if (result) {
-			break;
-		}
 	}
 	ao2_iterator_destroy(&i);
-
-	return result;
 }
 
 static void dump_str_and_free(int fd, struct ast_str *buf)
@@ -211,7 +202,8 @@ char *ast_sip_cli_traverse_objects(struct ast_cli_entry *e, int cmd, struct ast_
 
 	if (cmd == CLI_GENERATE) {
 		ast_free(context.output_buffer);
-		return complete_show_sorcery_object(container, formatter_entry, a->word, a->n);
+		complete_show_sorcery_object(container, formatter_entry, a->word);
+		return NULL;
 	}
 
 	if (is_container) {