This is an automated email from the git hooks/post-receive script. andyp pushed a commit to branch andyp-portability in repository gfs2-utils. commit 4503ce87bf90179bd5fe43387fd30931545f5251 Author: Andrew Price <anprice(a)redhat.com&gt; AuthorDate: Fri May 13 17:55:31 2022 +0100 Don't use glibc internal symbols Improve portability by removing uses of some non-standard symbols. Signed-off-by: Andrew Price <anprice(a)redhat.com&gt; --- gfs2/libgfs2/libgfs2.h | 8 ++++++-- gfs2/mkfs/main_grow.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h index fc1b273e..77753bfc 100644 --- a/gfs2/libgfs2/libgfs2.h +++ b/gfs2/libgfs2/libgfs2.h @@ -17,7 +17,9 @@ #include "osi_list.h" #include "osi_tree.h" -__BEGIN_DECLS +#ifdef __cplusplus +extern "C" { +#endif #if __BYTE_ORDER == __BIG_ENDIAN @@ -795,6 +797,8 @@ extern void lgfs2_dirent_out(struct lgfs2_dirent *d, void *dep); extern void lgfs2_leaf_in(struct lgfs2_leaf *lf, void *lfp); extern void lgfs2_leaf_out(struct lgfs2_leaf *lf, void *lfp); -__END_DECLS +#ifdef __cplusplus +} +#endif #endif /* __LIBGFS2_DOT_H__ */ diff --git a/gfs2/mkfs/main_grow.c b/gfs2/mkfs/main_grow.c index 524efe1b..66081a2e 100644 --- a/gfs2/mkfs/main_grow.c +++ b/gfs2/mkfs/main_grow.c @@ -45,7 +45,7 @@ extern int rename2system(struct lgfs2_sbd *sdp, char *new_dir, char *new_name); static int discard_blocks(int fd, uint64_t start, uint64_t len) { - __uint64_t range[2] = { start, len }; + uint64_t range[2] = { start, len }; if (ioctl(fd, BLKDISCARD, &range) < 0) return errno; -- To stop receiving notification emails like this one, please contact the administrator of this repository.

This is an automated email from the git hooks/post-receive script. andyp pushed a commit to branch andyp-portability in repository gfs2-utils. commit 99ba04bcc3224401e52762267cd749995434e4c5 Author: Andrew Price <anprice(a)redhat.com&gt; AuthorDate: Fri May 13 18:03:13 2022 +0100 fsck.gfs2: Use atexit() where on_exit() is not available atexit() is standard and on_exit() is not, but atexit() doesn't allow us to access the exit status, so use atexit() only where on_exit() is not available. Signed-off-by: Andrew Price <anprice(a)redhat.com&gt; --- configure.ac | 1 + gfs2/fsck/main.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/configure.ac b/configure.ac index ba80c2a8..03a9e739 100644 --- a/configure.ac +++ b/configure.ac @@ -100,6 +100,7 @@ AC_ARG_ENABLE([gprof], AC_HELP_STRING([--enable-gprof],[enable profiling instrumentation [default=no]]), [], [enable_gprof="no"]) +AC_CHECK_FUNCS([on_exit]) # We use the Check framework for unit tests PKG_CHECK_MODULES([check], [check >= 0.10.0], diff --git a/gfs2/fsck/main.c b/gfs2/fsck/main.c index ed61449e..ed6b068f 100644 --- a/gfs2/fsck/main.c +++ b/gfs2/fsck/main.c @@ -258,10 +258,21 @@ static int fsck_pass(const struct fsck_pass *p, struct lgfs2_sbd *sdp) return 0; } +/* + * on_exit() is non-standard but useful for reporting the exit status if it's + * available. + */ +#ifdef HAVE_ON_EXIT static void exitlog(int status, void *unused) { syslog(LOG_INFO, "exit: %d", status); } +#else +static void exitlog(void) +{ + syslog(LOG_INFO, "exit."); +} +#endif static void startlog(int argc, char **argv) { @@ -304,7 +315,11 @@ int main(int argc, char **argv) openlog("fsck.gfs2", LOG_CONS|LOG_PID, LOG_USER); startlog(argc - 1, &argv[1]); +#ifdef HAVE_ON_EXIT on_exit(exitlog, NULL); +#else + atexit(exitlog); +#endif memset(sdp, 0, sizeof(*sdp)); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

This is an automated email from the git hooks/post-receive script. andyp pushed a commit to branch andyp-portability in repository gfs2-utils. commit aa713bc533ef187e293559b76126140cd859d0c8 Author: Andrew Price <anprice(a)redhat.com&gt; AuthorDate: Fri May 13 19:11:19 2022 +0100 Configure script updates Fixes some complaints about obsolete autoconf symbols. We still get: configure.ac:56: warning: The macro `AC_PROG_CC_C99' is obsolete. Using AC_PROG_CC only is meant to replace this but removing the AC_PROG_CC_C99 breaks the build on RHEL7 so it's going to stay for now. Signed-off-by: Andrew Price <anprice(a)redhat.com&gt; --- configure.ac | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 03a9e739..8774b15b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. -AC_PREREQ([2.63]) +AC_PREREQ([2.69]) AC_INIT([gfs2-utils], [3.4.1.1.dev], [cluster-devel(a)redhat.com]) AM_INIT_AUTOMAKE([-Wno-portability]) AM_SILENT_RULES([yes]) @@ -13,13 +13,13 @@ AC_CONFIG_SRCDIR([gfs2/libgfs2/libgfs2.h]) AC_CONFIG_HEADERS([make/clusterautoconfig.h]) AC_CANONICAL_HOST -AC_PROG_LIBTOOL +LT_INIT AC_LANG([C]) #i18n support AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION([0.18]) +AM_GNU_GETTEXT_VERSION([0.19]) # Sanitize path @@ -61,7 +61,7 @@ AM_PROG_CC_C_O AC_PROG_LN_S AC_PROG_INSTALL AC_PROG_MAKE_SET -AC_PROG_LEX +AC_PROG_LEX([noyywrap]) test "$LEX" != "flex" && AC_MSG_ERROR([flex not found]) AC_CHECK_PROG([YACC], [bison], [bison -y]) test x"$YACC" = x && AC_MSG_ERROR([bison not found]) @@ -91,13 +91,13 @@ check_lib_no_libs() { # local options AC_ARG_ENABLE([debug], - AC_HELP_STRING([--enable-debug],[enable debug build [default=no]]), + AS_HELP_STRING([--enable-debug],[enable debug build [default=no]]), [], [enable_debug="no"]) AC_ARG_ENABLE([gcov], - AC_HELP_STRING([--enable-gcov],[enable coverage instrumentation [default=no]]), + AS_HELP_STRING([--enable-gcov],[enable coverage instrumentation [default=no]]), [], [enable_gcov="no"]) AC_ARG_ENABLE([gprof], - AC_HELP_STRING([--enable-gprof],[enable profiling instrumentation [default=no]]), + AS_HELP_STRING([--enable-gprof],[enable profiling instrumentation [default=no]]), [], [enable_gprof="no"]) AC_CHECK_FUNCS([on_exit]) -- To stop receiving notification emails like this one, please contact the administrator of this repository.