From 0f7bdf7d576e1e13e6eb649ebfbd753f7247856e Mon Sep 17 00:00:00 2001 From: Hugh McMaster Date: Mon, 6 Jun 2016 05:32:05 +0000 Subject: [PATCH] reg: Remove an unreachable 'else' pathway from wmain. Invalid operations are handled earlier in wmain. Signed-off-by: Hugh McMaster Signed-off-by: Alexandre Julliard --- programs/reg/reg.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 0df82e65072..ea77426c84b 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -874,7 +874,7 @@ static enum operations get_operation(const WCHAR *str) int wmain(int argc, WCHAR *argvW[]) { - int i, op; + int i, op, ret; BOOL show_op_help = FALSE; WCHAR *key_name, *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; BOOL value_empty = FALSE, value_all = FALSE, recurse = FALSE, force = FALSE; @@ -991,15 +991,10 @@ int wmain(int argc, WCHAR *argvW[]) } if (op == REG_ADD) - return reg_add(root, path, value_name, value_empty, type, separator, data, force); + ret = reg_add(root, path, value_name, value_empty, type, separator, data, force); else if (op == REG_DELETE) - return reg_delete(root, path, key_name, value_name, value_empty, value_all, force); + ret = reg_delete(root, path, key_name, value_name, value_empty, value_all, force); else if (op == REG_QUERY) - return reg_query(root, path, key_name, value_name, value_empty, recurse); - else - { - output_message(STRING_INVALID_OPTION, argvW[1]); - output_message(STRING_REG_HELP); - return 1; - } + ret = reg_query(root, path, key_name, value_name, value_empty, recurse); + return ret; }