From 119479f7054bee531073f2b413dec29df5f7dc45 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 9 Oct 2016 08:54:33 +0200 Subject: [PATCH] (input_autodetect) Don't do implicit memsets of char variables --- input/input_autodetect.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/input/input_autodetect.c b/input/input_autodetect.c index a2868a6e10..52d8adf79f 100644 --- a/input/input_autodetect.c +++ b/input/input_autodetect.c @@ -73,13 +73,15 @@ static void input_autoconfigure_joypad_conf(config_file_t *conf, static int input_try_autoconfigure_joypad_from_conf(config_file_t *conf, autoconfig_params_t *params) { + char ident[256]; + char input_driver[32]; int tmp_int = 0; - char ident[PATH_MAX_LENGTH] = {0}; - char input_driver[PATH_MAX_LENGTH] = {0}; int input_vid = 0; int input_pid = 0; int score = 0; + ident[0] = input_driver[0] = '\0'; + config_get_array(conf, "input_device", ident, sizeof(ident)); config_get_array(conf, "input_driver", input_driver, sizeof(input_driver)); @@ -114,13 +116,15 @@ static int input_try_autoconfigure_joypad_from_conf(config_file_t *conf, static void input_autoconfigure_joypad_add(config_file_t *conf, autoconfig_params_t *params) { - bool block_osd_spam; + char msg[PATH_MAX_LENGTH]; + char display_name[PATH_MAX_LENGTH]; + char device_type[PATH_MAX_LENGTH]; + bool block_osd_spam = false; static bool remote_is_bound = false; - char msg[PATH_MAX_LENGTH] = {0}; - char display_name[PATH_MAX_LENGTH] = {0}; - char device_type[PATH_MAX_LENGTH] = {0}; settings_t *settings = config_get_ptr(); + msg[0] = display_name[0] = device_type[0] = '\0'; + config_get_array(conf, "input_device_display_name", display_name, sizeof(display_name)); config_get_array(conf, "input_device_type", device_type, @@ -177,13 +181,15 @@ static bool input_autoconfigure_joypad_from_conf_dir( autoconfig_params_t *params) { size_t i; - char path[PATH_MAX_LENGTH] = {0}; + char path[PATH_MAX_LENGTH]; int ret = 0; int index = -1; int current_best = 0; config_file_t *conf = NULL; struct string_list *list = NULL; + path[0] = '\0'; + fill_pathname_application_special(path, sizeof(path), APPLICATION_SPECIAL_DIRECTORY_AUTOCONFIG); @@ -226,6 +232,8 @@ static bool input_autoconfigure_joypad_from_conf_dir( { char conf_path[PATH_MAX_LENGTH]; + conf_path[0] = '\0'; + config_get_config_path(conf, conf_path, sizeof(conf_path)); RARCH_LOG("Autodetect: selected configuration: %s\n", conf_path); @@ -288,6 +296,8 @@ bool input_config_autoconfigure_joypad(autoconfig_params_t *params) { char msg[PATH_MAX_LENGTH]; + msg[0] = '\0'; + if (!input_config_autoconfigure_joypad_init(params)) goto error; @@ -326,6 +336,8 @@ void input_config_autoconfigure_disconnect(unsigned i, const char *ident) { char msg[PATH_MAX_LENGTH]; + msg[0] = '\0'; + snprintf(msg, sizeof(msg), "Device #%u (%s) disconnected.", i, ident); runloop_msg_queue_push(msg, 2, 60, false); RARCH_LOG("Autodetect: %s\n", msg);