[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-1073-gce3bf664c

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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  ce3bf664c81569b2eb457f676814eade9d464141 (commit)
       via  13b74c3fc7718d3ac639d6c382b2a4e3ec70a6d1 (commit)
      from  6631419beba62893075eae5e1e13ddba9062d4f5 (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 ce3bf664c81569b2eb457f676814eade9d464141
Author: R. Diez <rdi...@rd...>
Date:   Sat Jun 21 22:05:17 2025 +0200

    configure.ac: rename M4 macro 'adapter' to prevent accidental conflicts
    
    Also remove a comment about such a conflict which had been already noticed.
    
    Change-Id: I6f301ccbd1261ea1c15c44a02d3f34f0cf5cb9f4
    Signed-off-by: R. Diez <rdi...@rd...>
    
    Reviewed-on: https://review.openocd.org/c/openocd/+/8972
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Tested-by: jenkins

diff --git a/configure.ac b/configure.ac
index 4b9471629..5a05f3171 100644
--- a/configure.ac
+++ b/configure.ac
@@ -206,8 +206,6 @@ m4_define([HOST_ARM_OR_AARCH64_BITBANG_ADAPTERS],
 	[[imx_gpio], [Bitbanging on NXP IMX processors], [IMX_GPIO]],
 	[[am335xgpio], [Bitbanging on AM335x (as found in Beaglebones)], [AM335XGPIO]]])
 
-# The word 'Adapter' in "Dummy Adapter" below must begin with a capital letter
-# because there is an M4 macro called 'adapter'.
 m4_define([DUMMY_ADAPTER],
 	[[[dummy], [Dummy Adapter], [DUMMY]]])
 
@@ -309,15 +307,15 @@ AC_ARG_ENABLE([dmem],
   [build_dmem=$enableval], [build_dmem=no])
 
 m4_define([AC_ARG_ADAPTERS], [
-  m4_foreach([adapter], [$1],
-	[AC_ARG_ENABLE(ADAPTER_OPT([adapter]),
-		AS_HELP_STRING([--enable-ADAPTER_OPT([adapter])[[[=yes/no/auto]]]],
-			[Enable building support for the ]ADAPTER_DESC([adapter])[ (default is $2)]),
+  m4_foreach([adapterTuple], [$1],
+	[AC_ARG_ENABLE(ADAPTER_OPT([adapterTuple]),
+		AS_HELP_STRING([--enable-ADAPTER_OPT([adapterTuple])[[[=yes/no/auto]]]],
+			[Enable building support for the ]ADAPTER_DESC([adapterTuple])[ (default is $2)]),
 		[case "${enableval}" in
 			yes|no|auto) ;;
-			*) AC_MSG_ERROR([Option --enable-ADAPTER_OPT([adapter]) has invalid value "${enableval}".]) ;;
+			*) AC_MSG_ERROR([Option --enable-ADAPTER_OPT([adapterTuple]) has invalid value "${enableval}".]) ;;
 			esac],
-		[ADAPTER_VAR([adapter])=$2])
+		[ADAPTER_VAR([adapterTuple])=$2])
   ])
 ])
 
@@ -622,21 +620,23 @@ PKG_CHECK_MODULES([LIBJAYLINK], [libjaylink >= 0.2],
 # Arg $3: What prerequisites are missing, to be shown in an error message
 #         if an adapter was requested but cannot be enabled.
 m4_define([PROCESS_ADAPTERS], [
-  m4_foreach([adapter], [$1], [
+  m4_foreach([adapterTuple], [$1], [
 	AS_IF([test $2], [
-		AS_IF([test "x$ADAPTER_VAR([adapter])" != "xno"], [
-			AC_DEFINE([BUILD_]ADAPTER_SYM([adapter]), [1], [1 if you want the ]ADAPTER_DESC([adapter]).)
+		AS_IF([test "x$ADAPTER_VAR([adapterTuple])" != "xno"], [
+			AC_DEFINE([BUILD_]ADAPTER_SYM([adapterTuple]), [1],
+			          [1 if you want the ]ADAPTER_DESC([adapterTuple]).)
 		], [
-			AC_DEFINE([BUILD_]ADAPTER_SYM([adapter]), [0], [0 if you do not want the ]ADAPTER_DESC([adapter]).)
+			AC_DEFINE([BUILD_]ADAPTER_SYM([adapterTuple]), [0],
+			          [0 if you do not want the ]ADAPTER_DESC([adapterTuple]).)
 		])
 	], [
-		AS_IF([test "x$ADAPTER_VAR([adapter])" = "xyes"], [
-			AC_MSG_ERROR([$3 is required for [adapter] "ADAPTER_DESC([adapter])".])
+		AS_IF([test "x$ADAPTER_VAR([adapterTuple])" = "xyes"], [
+			AC_MSG_ERROR([$3 is required for [adapterTuple] "ADAPTER_DESC([adapterTuple])".])
 		])
-		ADAPTER_VAR([adapter])=no
-		AC_DEFINE([BUILD_]ADAPTER_SYM([adapter]), [0], [0 if you do not want the ]ADAPTER_DESC([adapter]).)
+		ADAPTER_VAR([adapterTuple])=no
+		AC_DEFINE([BUILD_]ADAPTER_SYM([adapterTuple]), [0], [0 if you do not want the ]ADAPTER_DESC([adapterTuple]).)
 	])
-	AM_CONDITIONAL(ADAPTER_SYM([adapter]), [test "x$ADAPTER_VAR([adapter])" != "xno"])
+	AM_CONDITIONAL(ADAPTER_SYM([adapterTuple]), [test "x$ADAPTER_VAR([adapterTuple])" != "xno"])
   ])
 ])
 
@@ -839,7 +839,7 @@ echo
 echo
 echo OpenOCD configuration summary
 echo ---------------------------------------------------
-m4_foreach([adapter], [USB1_ADAPTERS,
+m4_foreach([adapterTuple], [USB1_ADAPTERS,
 	HIDAPI_ADAPTERS, HIDAPI_USB1_ADAPTERS, LIBFTDI_ADAPTERS,
 	LIBFTDI_USB1_ADAPTERS,
 	LIBGPIOD_ADAPTERS,
@@ -857,8 +857,8 @@ m4_foreach([adapter], [USB1_ADAPTERS,
 	DUMMY_ADAPTER,
 	OPTIONAL_LIBRARIES,
 	COVERAGE],
-	[s=m4_format(["%-49s"], ADAPTER_DESC([adapter]))
-	AS_CASE([$ADAPTER_VAR([adapter])],
+	[s=m4_format(["%-49s"], ADAPTER_DESC([adapterTuple]))
+	AS_CASE([$ADAPTER_VAR([adapterTuple])],
 		[auto], [
 			echo "$s"yes '(auto)'
 		],
@@ -870,8 +870,8 @@ m4_foreach([adapter], [USB1_ADAPTERS,
 		],
 		[
 			AC_MSG_ERROR(m4_normalize([
-				Error in [adapter] "ADAPTER_ARG([adapter])": Variable "ADAPTER_VAR([adapter])"
-				has invalid value "$ADAPTER_VAR([adapter])".]))
+				Error in [adapterTuple] "ADAPTER_ARG([adapterTuple])": Variable "ADAPTER_VAR([adapterTuple])"
+				has invalid value "$ADAPTER_VAR([adapterTuple])".]))
 	])
 ])
 echo

commit 13b74c3fc7718d3ac639d6c382b2a4e3ec70a6d1
Author: Antonio Borneo <bor...@gm...>
Date:   Sat Jun 21 12:11:24 2025 +0200

    helper: types: fix proper return type in example of ARRAY_SIZE()
    
    The example in the comment above the declaration of the macro
    ARRAY_SIZE() assigns the value to a variable of type 'unsigned'
    that is not allowed by the coding style (should be 'unsigned int')
    and is not correct since the macro uses 'sizeof()' and the type
    returned is 'size_t'.
    
    Fix the comment.
    
    Change-Id: I18c32b5328a229ab74b56dafab46a064ce5d23c5
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8970
    Reviewed-by: zapb <de...@za...>
    Tested-by: jenkins

diff --git a/src/helper/types.h b/src/helper/types.h
index 53249e5b7..b3edd2118 100644
--- a/src/helper/types.h
+++ b/src/helper/types.h
@@ -51,7 +51,7 @@
  * Compute the number of elements of a variable length array.
  * <code>
  * const char *strs[] = { "a", "b", "c" };
- * unsigned num_strs = ARRAY_SIZE(strs);
+ * size_t num_strs = ARRAY_SIZE(strs);
  * </code>
  */
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))

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

Summary of changes:
 configure.ac       | 44 ++++++++++++++++++++++----------------------
 src/helper/types.h |  2 +-
 2 files changed, 23 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository




[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-1073-gce3bf664c

The Open On-Chip Debugger

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-1073-gce3bf664c