From fd5751fc4e790ff2b3b03d10abe648c9a7398803 Mon Sep 17 00:00:00 2001 From: Ake Date: Wed, 25 Nov 2020 12:40:40 +0100 Subject: [PATCH] Adjusted parameter name --- config.h | 4 ++-- configure | 24 ++++++++++++------------ vscp | 2 +- vscphelperlib.cpp | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/config.h b/config.h index c245403..32fbbdb 100644 --- a/config.h +++ b/config.h @@ -276,7 +276,7 @@ #define PACKAGE_NAME "vscphelperlib" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "vscphelperlib 14.0.0" +#define PACKAGE_STRING "vscphelperlib 14.0.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "vscphelperlib" @@ -285,7 +285,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "14.0.0" +#define PACKAGE_VERSION "14.0.2" /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void diff --git a/configure b/configure index afbb9c5..95290c1 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for vscphelperlib '14.0.0'. +# Generated by GNU Autoconf 2.69 for vscphelperlib '14.0.2'. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='vscphelperlib' PACKAGE_TARNAME='vscphelperlib' -PACKAGE_VERSION=''14.0.0'' -PACKAGE_STRING='vscphelperlib '14.0.0'' +PACKAGE_VERSION=''14.0.2'' +PACKAGE_STRING='vscphelperlib '14.0.2'' PACKAGE_BUGREPORT='akhe@grodansparadis.com' PACKAGE_URL='' @@ -1266,7 +1266,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures vscphelperlib '14.0.0' to adapt to many kinds of systems. +\`configure' configures vscphelperlib '14.0.2' to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1328,7 +1328,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of vscphelperlib '14.0.0':";; + short | recursive ) echo "Configuration of vscphelperlib '14.0.2':";; esac cat <<\_ACEOF @@ -1422,7 +1422,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -vscphelperlib configure '14.0.0' +vscphelperlib configure '14.0.2' generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2066,7 +2066,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by vscphelperlib $as_me '14.0.0', which was +It was created by vscphelperlib $as_me '14.0.2', which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -6531,7 +6531,7 @@ fi MAJOR_VERSION=14 MINOR_VERSION=0 -RELEASE_VERSION=0 +RELEASE_VERSION=2 BUILD_VERSION=0 if test "${vscp_static}" = yes ; then @@ -6551,7 +6551,7 @@ fi -PROJ_SUBDIRS="linux tests" +PROJ_SUBDIRS="linux" @@ -7071,7 +7071,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by vscphelperlib $as_me '14.0.0', which was +This file was extended by vscphelperlib $as_me '14.0.2', which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7133,7 +7133,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -vscphelperlib config.status '14.0.0' +vscphelperlib config.status '14.0.2' configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -7853,7 +7853,7 @@ fi echo echo " VSCP configuration" echo "--------------------------------------------" -echo "VSCP version : ${PACKAGE_VERSION} (14.0.0.0)" +echo "VSCP version : ${PACKAGE_VERSION} (14.0.2.0)" echo "System : `uname -a` " echo "Architecture : $(arch)" echo "VSCP GUI Build : ${vscp_gui}" diff --git a/vscp b/vscp index c93f456..ec938d6 160000 --- a/vscp +++ b/vscp @@ -1 +1 @@ -Subproject commit c93f456fd9aa3ba91ad9cf28b6abba27164f4541 +Subproject commit ec938d6e5545f8fc269d068a18ce131fd4ae0894 diff --git a/vscphelperlib.cpp b/vscphelperlib.cpp index f21a41f..5fa3912 100644 --- a/vscphelperlib.cpp +++ b/vscphelperlib.cpp @@ -1969,14 +1969,14 @@ vscphlp_setVscpEventExFromString(vscpEventEx* pEvent, const char* p) */ #ifdef WIN32 extern "C" DllExport int WINAPI EXPORT -vscphlp_convertStringToEventEx(vscpEventEx* pEvent, const char* p) +vscphlp_convertStringToEventEx(vscpEventEx* pEventEx, const char* p) #else extern "C" int -vscphlp_convertStringToEventEx(vscpEventEx* pEvent, const char* p) +vscphlp_convertStringToEventEx(vscpEventEx* pEventEx, const char* p) #endif { std::string str = std::string(p); - return vscp_convertStringToEventEx(pEvent, str) ? VSCP_ERROR_SUCCESS + return vscp_convertStringToEventEx(pEventEx, str) ? VSCP_ERROR_SUCCESS : VSCP_ERROR_ERROR; }