Maarrk/tio
1
0
Fork 0
mirror of https://github.com/tio/tio.git synced 2026-05-01 14:57:59 +02:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions

Fix shadow variables

Browse source
This commit is contained in:
Martin Lund 2024-05-07 09:50:07 +02:00
parent 9320f54a73
commit 873bd6973d
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/configfile.c
View file

@ -353,6 +353,9 @@ static int config_file_resolve(void)
void config_file_show_profiles(void) void config_file_show_profiles(void)
{ {
GKeyFile *keyfile;
GError *error = NULL;
memset(&config, 0, sizeof(struct config_t)); memset(&config, 0, sizeof(struct config_t));
// Find config file // Find config file
@ -362,9 +365,6 @@ void config_file_show_profiles(void)
return; return;
} }
GKeyFile *keyfile;
GError *error = NULL;
keyfile = g_key_file_new(); keyfile = g_key_file_new();
if (!g_key_file_load_from_file(keyfile, config.path, G_KEY_FILE_NONE, &error)) if (!g_key_file_load_from_file(keyfile, config.path, G_KEY_FILE_NONE, &error))
@ -458,10 +458,10 @@ static char *match_and_replace(const char *str, const char *pattern, char *devic
{ {
tio_debug_printf("Subexpression %d match: ", i); tio_debug_printf("Subexpression %d match: ", i);
int k = 0; int k = 0;
for (int j = matches[i].rm_so; j < matches[i].rm_eo; j++) for (int l = matches[i].rm_so; l < matches[i].rm_eo; l++)
{ {
tio_debug_printf_raw("%c", str[j]); tio_debug_printf_raw("%c", str[l]);
replacement_str[k++] = str[j]; replacement_str[k++] = str[l];
} }
replacement_str[k] = '\0'; replacement_str[k] = '\0';
sprintf(m_key, "%%m%d", i); sprintf(m_key, "%%m%d", i);
@ -541,11 +541,11 @@ void config_file_parse(void)
} }
// Lookup 'pattern' key // Lookup 'pattern' key
GError *error = NULL;
gchar *pattern = g_key_file_get_string(keyfile, group[i], "pattern", &error); gchar *pattern = g_key_file_get_string(keyfile, group[i], "pattern", &error);
if (error != NULL) if (error != NULL)
{ {
g_error_free(error); g_error_free(error);
error = NULL;
continue; continue;
} }
@ -554,6 +554,7 @@ void config_file_parse(void)
if (error != NULL) if (error != NULL)
{ {
g_error_free(error); g_error_free(error);
error = NULL;
continue; continue;
} }
@ -564,14 +565,14 @@ void config_file_parse(void)
if (config.device != NULL) if (config.device != NULL)
{ {
// Match found - save device // Match found - save device
char *device = strdup(config.device); device = strdup(config.device);
// Parse found group // Parse found group (may replace config.device)
config_parse_keys(keyfile, group[i]); config_parse_keys(keyfile, group[i]);
// Update configuration // Update configuration
config.active_group = strdup(group[i]); config.active_group = strdup(group[i]);
config.device = device; config.device = device; // Restore new device string
break; break;
} }