flash/nor/stm32h7x: fix option bytes handling to work with both banks

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

diff --git a/src/helper/configuration.c b/src/helper/configuration.c
index 31a618c665efa5cc8c8a4462fd381e8bec7febec..114ad2c6c90e6f47ee591d61becdbd92a15304d8 100644 (file)
--- a/src/helper/configuration.c
+++ b/src/helper/configuration.c
@@ -16,9 +16,7 @@
  *   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.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -36,8 +34,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 +45,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)
 {