[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-197-g247d8df31

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  247d8df3146f2e80487962fe5103cd28f170d288 (commit)
      from  faf7202f8ee65f21a96ea1ebf33f7157c97065f0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 247d8df3146f2e80487962fe5103cd28f170d288
Author: Antonio Borneo <bor...@gm...>
Date:   Sat May 6 16:14:15 2023 +0200

    helper: replacements: rework including replacements.h
    
    The static analyser 'sparse' complains that the functions
    clear_malloc() and fill_malloc() are defined global but not cross
    checked against a prototype in an include file.
    
    Rework replacements.h and replacements.c to let the former be
    included by the latter.
    
    Change-Id: I536393a9c3718dcd7e144cde8f02e169f64c88e0
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7667
    Tested-by: jenkins

diff --git a/src/helper/replacements.c b/src/helper/replacements.c
index b30dbd5d6..782d97518 100644
--- a/src/helper/replacements.c
+++ b/src/helper/replacements.c
@@ -10,10 +10,18 @@
  *   Copyright (C) 2008 by Spencer Oliver                                  *
  *   sp...@sp...                                                  *
  ***************************************************************************/
-/* DANGER!!!! These must be defined *BEFORE* replacements.h and the malloc() macro!!!! */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+/* define IN_REPLACEMENTS_C before include replacements.h */
+#define IN_REPLACEMENTS_C
+#include "replacements.h"
 
 #include <stdlib.h>
 #include <string.h>
+
 /*
  * clear_malloc
  *
@@ -41,10 +49,6 @@ void *fill_malloc(size_t size)
 	return t;
 }
 
-#define IN_REPLACEMENTS_C
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
diff --git a/src/helper/replacements.h b/src/helper/replacements.h
index 9eac4d245..6e30b628b 100644
--- a/src/helper/replacements.h
+++ b/src/helper/replacements.h
@@ -66,12 +66,10 @@ int gettimeofday(struct timeval *tv, struct timezone *tz);
 
 #endif
 
-#ifndef IN_REPLACEMENTS_C
-/**** clear_malloc & fill_malloc ****/
 void *clear_malloc(size_t size);
 void *fill_malloc(size_t size);
-#endif
 
+#ifndef IN_REPLACEMENTS_C
 /*
  * Now you have 3 ways for the malloc function:
  *
@@ -100,6 +98,7 @@ void *fill_malloc(size_t size);
 
 /* #define malloc(_a) clear_malloc(_a)
  * #define malloc(_a) fill_malloc(_a) */
+#endif  /* IN_REPLACEMENTS_C */
 
 /* GNU extensions to the C library that may be missing on some systems */
 #ifndef HAVE_STRNDUP

-----------------------------------------------------------------------

Summary of changes:
 src/helper/replacements.c | 14 +++++++++-----
 src/helper/replacements.h |  5 ++---
 2 files changed, 11 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository