From 2d65bbd94129c4542394a83151cb1a131c3c7871 Mon Sep 17 00:00:00 2001 From: nicm Date: Thu, 25 Apr 2019 19:36:59 +0000 Subject: options_array_item_value cannot return NULL. --- status.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'status.c') diff --git a/status.c b/status.c index 1a11a564..34ed3778 100644 --- a/status.c +++ b/status.c @@ -1293,7 +1293,6 @@ status_prompt_complete_list(u_int *size, const char *s) size_t slen = strlen(s), valuelen; struct options_entry *o; struct options_array_item *a; - union options_value *ov; const char *layouts[] = { "even-horizontal", "even-vertical", "main-horizontal", "main-vertical", "tiled", NULL @@ -1322,11 +1321,7 @@ status_prompt_complete_list(u_int *size, const char *s) if (o != NULL) { a = options_array_first(o); while (a != NULL) { - ov = options_array_item_value(a); - if (ov == NULL) - goto next; - - value = ov->string; + value = options_array_item_value(a)->string; if ((cp = strchr(value, '=')) == NULL) goto next; valuelen = cp - value; -- cgit