From aa797f4fd861e481bbff8da1212de9b5f85ed0fc Mon Sep 17 00:00:00 2001 From: rahra Date: Tue, 8 Mar 2022 08:47:20 +0100 Subject: [PATCH] updated autotools, fixed some gcc warnings, removed 'git-log' from version --- configure.ac | 8 ++++---- src/libhpxml.c | 3 +++ src/smrender.c | 9 +++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 5a1c5fc..88fbc21 100644 --- a/configure.ac +++ b/configure.ac @@ -1,13 +1,13 @@ -AC_PREREQ(2.67) -define([svnversion], esyscmd([sh -c "echo -n `git log --oneline | wc -l`"]))dnl -AC_INIT([smrender], [[4.2.g]svnversion], [bf@abenteuerland.at]) +AC_PREREQ([2.71]) +#define([svnversion], esyscmd([sh -c "echo -n `git log --oneline | wc -l`"]))dnl +AC_INIT([smrender],[[4.3.0]],[bf@abenteuerland.at]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign -Wall -Werror]) AM_PROG_AR LT_INIT AC_SUBST([CFLAGS], [["$CFLAGS -Wall -Wextra"]]) #AC_SUBST([CFLAGS], [["-g -Wall"]]) -AC_PROG_CC_C99 +AC_PROG_CC AC_PROG_LN_S AC_PROG_MKDIR_P AC_CONFIG_HEADERS([config.h]) diff --git a/src/libhpxml.c b/src/libhpxml.c index 1223a68..eb17081 100644 --- a/src/libhpxml.c +++ b/src/libhpxml.c @@ -305,6 +305,7 @@ int cblank(char *c) { case '\n': hpx_lineno_++; + /* fall through */ case '\t': case '\r': #ifdef MODMEM @@ -328,6 +329,7 @@ int cblank1(const char *c) { case '\n': hpx_lineno_++; + /* fall through */ case '\t': case '\r': case ' ': @@ -688,6 +690,7 @@ int hpx_fprintf_tag(FILE *f, const hpx_tag_t *p) case HPX_SINGLE: s = "/"; + /* fall through */ case HPX_OPEN: n = fprintf(f, "<%.*s", p->tag.len, p->tag.buf); for (i = 0; i < p->nattr; i++) diff --git a/src/smrender.c b/src/smrender.c index 85e44e7..65b2f3e 100644 --- a/src/smrender.c +++ b/src/smrender.c @@ -1,4 +1,4 @@ -/* Copyright 2011-2021 Bernhard R. Fischer, 4096R/8E24F29D +/* Copyright 2011-2022 Bernhard R. Fischer, 4096R/8E24F29D * * This file is part of smrender. * @@ -18,7 +18,8 @@ /*! \file smrender.c * This file contains the main() function and main initialization functions. * - * @author Bernhard R. Fischer + * \author Bernhard R. Fischer, + * \date 2022/03/08 */ #ifdef HAVE_CONFIG_H @@ -463,7 +464,7 @@ char *init_rd_paper(struct rdata *rd, const char *paper) static void print_version(void) { - printf("Seamark renderer V" PACKAGE_VERSION ", (c) 2011-2021, Bernhard R. Fischer, 4096R/8E24F29D .\n" + printf("Seamark renderer V" PACKAGE_VERSION ", (c) 2011-2022, Bernhard R. Fischer, 4096R/8E24F29D .\n" "See http://www.abenteuerland.at/smrender/ for more information.\n"); #ifdef HAVE_CAIRO printf("Using libcairo %s.\n", cairo_version_string()); @@ -1250,7 +1251,7 @@ int main(int argc, char *argv[]) { case AUTO_GRID: auto_grid(rd, &grd); - // intentionally, there's no break + /* fall through */ case USER_GRID: grid(rd, &grd);