X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Fconfiguration.c;h=2ea5da480cb81cc26b2bc95581c5165db1d93d11;hp=95b4c7e0ce3edaef4c2c5dae80fd635ac51e4541;hb=425e43d9d1f09a4de86eae89c91924ec98ef2de0;hpb=3813fda44adcea486b7308423a699f63d79273ee diff --git a/src/helper/configuration.c b/src/helper/configuration.c index 95b4c7e0ce..2ea5da480c 100644 --- a/src/helper/configuration.c +++ b/src/helper/configuration.c @@ -2,7 +2,7 @@ * Copyright (C) 2004, 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * - * Copyright (C) 2007,2008 Øyvind Harboe * + * Copyright (C) 2007,2008 Øyvind Harboe * * oyvind.harboe@zylin.com * * * * This program is free software; you can redistribute it and/or modify * @@ -37,16 +37,18 @@ static char** script_search_dirs; void add_script_search_dir (const char *dir) { num_script_dirs++; - script_search_dirs = (char **)realloc(script_search_dirs, (num_script_dirs+1) * sizeof (char *)); + script_search_dirs = (char **)realloc(script_search_dirs, (num_script_dirs + 1) * sizeof (char *)); script_search_dirs[num_script_dirs-1] = strdup(dir); script_search_dirs[num_script_dirs] = NULL; + + LOG_DEBUG("adding %s", dir); } void add_config_command (const char *cfg) { num_config_files++; - config_file_names = (char **)realloc(config_file_names, (num_config_files+1) * sizeof (char *)); + config_file_names = (char **)realloc(config_file_names, (num_config_files + 1) * sizeof (char *)); config_file_names[num_config_files-1] = strdup(cfg); config_file_names[num_config_files] = NULL; @@ -86,14 +88,14 @@ char *find_file(const char *file) return NULL; } -FILE *open_file_from_path (char *file, char *mode) +FILE *open_file_from_path(const char *file, const char *mode) { if (mode[0]!='r') { return fopen(file, mode); } else { - char *full_path=find_file(file); + char *full_path = find_file(file); if (full_path == NULL) return NULL; FILE *fp = NULL; @@ -103,7 +105,7 @@ FILE *open_file_from_path (char *file, char *mode) } } -int parse_config_file(struct command_context_s *cmd_ctx) +int parse_config_file(struct command_context *cmd_ctx) { int retval; char **cfg; @@ -115,7 +117,7 @@ int parse_config_file(struct command_context_s *cmd_ctx) while (*cfg) { - retval=command_run_line(cmd_ctx, *cfg); + retval = command_run_line(cmd_ctx, *cfg); if (retval != ERROR_OK) return retval; cfg++;