* gnulib: Update to latest. * m4/gnulib-cache.m4: Regenerate. * src/macro.c (expand_macro): Deal with obstack API change. * src/builtin.c (mkstemp_helper): Likewise.
Signed-off-by: Eric Blake <[email protected]> --- It's been a while, but I had some time so I tried to see what's changed in gnulib. This was a bit trickier than some upgrades in the past, due to gnulib's semantic changes in obstack.h. gnulib | 2 +- m4/gnulib-cache.m4 | 4 ++-- src/builtin.c | 2 +- src/macro.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gnulib b/gnulib index a39d408..480d374 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit a39d4083cab589d7cd6a13e8a4b8db8875261d75 +Subproject commit 480d374e596a0ee3fed168ab42cd84c313ad3c89 diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4 index f0470f7..034e368 100644 --- a/m4/gnulib-cache.m4 +++ b/m4/gnulib-cache.m4 @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2016 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --local-dir=gl --lib=libm4 --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --with-tests --with-c++-tests --avoid=lock-tests --avoid=tls-tests --makefile-name=gnulib.mk --no-conditional-dependencies --no-libtool --macro-prefix=M4 announce-gen assert autobuild avltree-oset binary-io c-stack clean-temp cloexec close-stream closein config-h dirname error execute fclose fdl-1.3 fflush filenamecat fopen fopen-safer fseeko gendocs getopt-gnu git-version-gen gnu-web-doc-update gnumakefile gnupload gpl-3.0 ignore-value intprops maintainer-makefile manywarnings memchr2 mkstemp obstack progname regex rename sigaction sigpipe spawn-pipe stdbool stdint stdlib-safer strsignal strstr strtod unlocked-io update-copyright vc-list-files verror version-etc version-etc-fsf wait-process xalloc xoset xprintf xvasprintf-posix +# gnulib-tool --import --local-dir=gl --lib=libm4 --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --with-tests --with-c++-tests --avoid=lock-tests --avoid=tls-tests --makefile-name=gnulib.mk --no-conditional-dependencies --no-libtool --macro-prefix=M4 announce-gen assert autobuild avltree-oset binary-io c-stack clean-temp cloexec close-stream closein config-h dirname error execute fclose fdl-1.3 fflush filenamecat fopen fopen-safer fseeko gendocs getopt-gnu git-version-gen gnu-web-doc-update gnumakefile gnupload gpl-3.0 ignore-value intprops maintainer-makefile manywarnings memchr2 mkstemp obstack progname regex rename sigaction sigpipe spawn-pipe stdbool stdint stdlib-safer strsignal strstr strtod unlocked-io update-copyright vc-list-files verror version-etc version-etc-fsf wait-process xalloc xoset xprintf xvasprintf-posix # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([gl]) diff --git a/src/builtin.c b/src/builtin.c index 1e0ff25..03566b0 100644 --- a/src/builtin.c +++ b/src/builtin.c @@ -1426,7 +1426,7 @@ mkstemp_helper (struct obstack *obs, const char *me, const char *pattern, { close (fd); /* Remove NUL, then finish quote. */ - obstack_blank (obs, -1); + obstack_blank_fast (obs, -1); obstack_grow (obs, rquote.string, rquote.length); } } diff --git a/src/macro.c b/src/macro.c index da6f865..c7ac4b5 100644 --- a/src/macro.c +++ b/src/macro.c @@ -46,8 +46,8 @@ static struct obstack argc_stack; /* The shared stack of pointers to collected arguments for macro calls. This object is never finished; we exploit the fact that - obstack_blank is documented to take a negative size to reduce the - size again. */ + obstack_blank_fast is documented to take a negative size to reduce + the size again. */ static struct obstack argv_stack; /*----------------------------------------------------------------------. @@ -387,5 +387,5 @@ expand_macro (symbol *sym) obstack_free (&argc_stack, argv[0]); else obstack_free (&arguments, NULL); - obstack_blank (&argv_stack, -argc * sizeof (token_data *)); + obstack_blank_fast (&argv_stack, -argc * sizeof (token_data *)); } -- 2.9.3 _______________________________________________ M4-patches mailing list [email protected] https://lists.gnu.org/mailman/listinfo/m4-patches
