Skip to content

Commit

Permalink
Fix POSIX thread cleanup code - _mxml_fini shouldn't be calling the g…
Browse files Browse the repository at this point in the history
…lobal

destructor, just deleting the per-thread key.

Bump version to 3.3.1.
  • Loading branch information
michaelrsweet committed Dec 15, 2021
1 parent 0237559 commit 6785ee4
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# Changes in Mini-XML 3.3.1

- Fixed a POSIX thread cleanup bug on macOS - per-thread data destructor called
twice.


# Changes in Mini-XML 3.3

- Cleaned up usage of `free` throughout the library (Issue #276)
Expand Down
20 changes: 10 additions & 10 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.71 for Mini-XML 3.3.
# Generated by GNU Autoconf 2.71 for Mini-XML 3.3.1.
#
# Report bugs to <https://github.com/michaelrsweet/mxml/issues>.
#
Expand Down Expand Up @@ -610,8 +610,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Mini-XML'
PACKAGE_TARNAME='mxml'
PACKAGE_VERSION='3.3'
PACKAGE_STRING='Mini-XML 3.3'
PACKAGE_VERSION='3.3.1'
PACKAGE_STRING='Mini-XML 3.3.1'
PACKAGE_BUGREPORT='https://github.com/michaelrsweet/mxml/issues'
PACKAGE_URL='https://www.msweet.org/mxml'

Expand Down Expand Up @@ -1301,7 +1301,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 Mini-XML 3.3 to adapt to many kinds of systems.
\`configure' configures Mini-XML 3.3.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1367,7 +1367,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of Mini-XML 3.3:";;
short | recursive ) echo "Configuration of Mini-XML 3.3.1:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1470,7 +1470,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
Mini-XML configure 3.3
Mini-XML configure 3.3.1
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1770,7 +1770,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 Mini-XML $as_me 3.3, which was
It was created by Mini-XML $as_me 3.3.1, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
Expand Down Expand Up @@ -2831,7 +2831,7 @@ ac_config_headers="$ac_config_headers config.h"



VERSION="3.3"
VERSION="3.3.1"

printf "%s\n" "#define MXML_VERSION \"Mini-XML v$VERSION\"" >>confdefs.h

Expand Down Expand Up @@ -6012,7 +6012,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 Mini-XML $as_me 3.3, which was
This file was extended by Mini-XML $as_me 3.3.1, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -6077,7 +6077,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
Mini-XML config.status 3.3
Mini-XML config.status 3.3.1
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ AC_PREREQ([2.70])


dnl Package name and version...
AC_INIT([Mini-XML], [3.3], [https://github.com/michaelrsweet/mxml/issues], [mxml], [https://www.msweet.org/mxml])
AC_INIT([Mini-XML], [3.3.1], [https://github.com/michaelrsweet/mxml/issues], [mxml], [https://www.msweet.org/mxml])


dnl This line is provided to ensure that you don't run the autoheader program
Expand Down
6 changes: 0 additions & 6 deletions mxml-private.c
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,6 @@ _mxml_destructor(void *g) /* I - Global data */
static void
_MXML_FINI(void)
{
_mxml_global_t *global; /* Global data */


if ((global = (_mxml_global_t *)pthread_getspecific(_mxml_key)) != NULL)
_mxml_destructor(global);

pthread_key_delete(_mxml_key);
}

Expand Down
2 changes: 1 addition & 1 deletion vcnet/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
* Version number...
*/

#define MXML_VERSION "Mini-XML v3.3"
#define MXML_VERSION "Mini-XML v3.3.1"


/*
Expand Down
2 changes: 1 addition & 1 deletion xcode/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* Version number...
*/

#define MXML_VERSION "Mini-XML v3.3"
#define MXML_VERSION "Mini-XML v3.3.1"


/*
Expand Down

0 comments on commit 6785ee4

Please sign in to comment.