summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cmd-list-keys.c4
-rw-r--r--cmd-show-options.c4
2 files changed, 3 insertions, 5 deletions
diff --git a/cmd-list-keys.c b/cmd-list-keys.c
index 7e340516..e1ec4d3c 100644
--- a/cmd-list-keys.c
+++ b/cmd-list-keys.c
@@ -269,7 +269,7 @@ cmd_list_keys_exec(struct cmd *self, struct cmdq_item *item)
tmpsize *= 2;
tmp = xrealloc(tmp, tmpsize);
}
- tmpused = strlcat(tmp, cp, tmpsize);
+ strlcat(tmp, cp, tmpsize);
tmpused = strlcat(tmp, " ", tmpsize);
free(cp);
@@ -279,7 +279,7 @@ cmd_list_keys_exec(struct cmd *self, struct cmdq_item *item)
tmpsize *= 2;
tmp = xrealloc(tmp, tmpsize);
}
- tmpused = strlcat(tmp, cp, tmpsize);
+ strlcat(tmp, cp, tmpsize);
tmpused = strlcat(tmp, " ", tmpsize);
free(cp);
diff --git a/cmd-show-options.c b/cmd-show-options.c
index 0b9eb096..b5c5f59d 100644
--- a/cmd-show-options.c
+++ b/cmd-show-options.c
@@ -212,11 +212,9 @@ cmd_show_options_all(struct cmd *self, struct cmdq_item *item, int scope,
if ((self->entry != &cmd_show_hooks_entry &&
!args_has(self->args, 'H') &&
- oe != NULL &&
(oe->flags & OPTIONS_TABLE_IS_HOOK)) ||
(self->entry == &cmd_show_hooks_entry &&
- (oe == NULL ||
- (~oe->flags & OPTIONS_TABLE_IS_HOOK))))
+ (~oe->flags & OPTIONS_TABLE_IS_HOOK)))
continue;
o = options_get_only(oo, oe->name);