Speed up remote bitbang.

[fw/openocd] / src / helper / configuration.c

diff --git a/src/helper/configuration.c b/src/helper/configuration.c
index bfb73fd7bac7fe07152e836afdce199c5963c144..7e791d08489740782175e47487ca2775557501f9 100644 (file)
--- a/src/helper/configuration.c
+++ b/src/helper/configuration.c
@@ -16,16 +16,16 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include "configuration.h"
 #include "log.h"
+#include "replacements.h"
 
 static size_t num_config_files;
 static char **config_file_names;
@@ -36,8 +36,7 @@ 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 = 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;
@@ -48,13 +47,27 @@ void add_script_search_dir(const char *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 = 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;
 }
 
+void free_config(void)
+{
+       while (num_config_files)
+               free(config_file_names[--num_config_files]);
+
+       free(config_file_names);
+       config_file_names = NULL;
+
+       while (num_script_dirs)
+               free(script_search_dirs[--num_script_dirs]);
+
+       free(script_search_dirs);
+       script_search_dirs = NULL;
+}
+
 /* return full path or NULL according to search rules */
 char *find_file(const char *file)
 {
@@ -98,7 +111,7 @@ FILE *open_file_from_path(const char *file, const char *mode)
                return fopen(file, mode);
        else {
                char *full_path = find_file(file);
-               if (full_path == NULL)
+               if (!full_path)
                        return NULL;
                FILE *fp = NULL;
                fp = fopen(full_path, mode);
@@ -137,12 +150,12 @@ char *get_home_dir(const char *append_path)
 {
        char *home = getenv("HOME");
 
-       if (home == NULL) {
+       if (!home) {
 
 #ifdef _WIN32
                home = getenv("USERPROFILE");
 
-               if (home == NULL) {
+               if (!home) {
 
                        char homepath[MAX_PATH];
                        char *drive = getenv("HOMEDRIVE");
@@ -160,7 +173,7 @@ char *get_home_dir(const char *append_path)
 #endif
        }
 
-       if (home == NULL)
+       if (!home)
                return home;
 
        char *home_path;