From 104af19d65bc356c1e7df2d628e13ff8021bfb91 Mon Sep 17 00:00:00 2001 From: Lev Walkin Date: Sun, 24 Jan 2016 22:13:27 -0800 Subject: pedantic c89 safety --- configure.ac | 6 ++++-- skeletons/INTEGER.h | 2 +- skeletons/OBJECT_IDENTIFIER.c | 2 +- skeletons/asn_codecs_prim.c | 2 +- skeletons/asn_internal.h | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index a937bf2b..a59ac43f 100644 --- a/configure.ac +++ b/configure.ac @@ -79,9 +79,11 @@ dnl Skeletons should be very compatible with most of the compilers, hence dnl very strict backward compatibility flags. SKELETONS_CFLAGS="${ADD_CFLAGS}" AX_CHECK_COMPILE_FLAG([-std=c89], - [SKELETONS_FLAGS="$SKELETONS_FLAGS -std=c89"]) + [SKELETONS_CFLAGS="$SKELETONS_CFLAGS -std=c89"]) AX_CHECK_COMPILE_FLAG([-Wpedantic], - [SKELETONS_FLAGS="$SKELETONS_FLAGS -Wpedantic"]) + [SKELETONS_CFLAGS="$SKELETONS_CFLAGS -Wpedantic"]) +AX_CHECK_COMPILE_FLAG([-Wno-duplicate-decl-specifier], + [SKELETONS_CFLAGS="$SKELETONS_CFLAGS -Wno-duplicate-decl-specifier"]) AC_SUBST(SKELETONS_CFLAGS) dnl Checks for header files. diff --git a/skeletons/INTEGER.h b/skeletons/INTEGER.h index 2813f0cb..9a880970 100644 --- a/skeletons/INTEGER.h +++ b/skeletons/INTEGER.h @@ -63,7 +63,7 @@ enum asn_strtol_result_e { ASN_STRTOL_ERROR_INVAL = -2, /* Invalid data encountered (e.g., "+-") */ ASN_STRTOL_EXPECT_MORE = -1, /* More data expected (e.g. "+") */ ASN_STRTOL_OK = 0, /* Conversion succeded, number ends at (*end) */ - ASN_STRTOL_EXTRA_DATA = 1, /* Conversion succeded, but the string has extra stuff */ + ASN_STRTOL_EXTRA_DATA = 1 /* Conversion succeded, but the string has extra stuff */ }; enum asn_strtol_result_e asn_strtol_lim(const char *str, const char **end, long *l); diff --git a/skeletons/OBJECT_IDENTIFIER.c b/skeletons/OBJECT_IDENTIFIER.c index 03bfc033..776c095c 100644 --- a/skeletons/OBJECT_IDENTIFIER.c +++ b/skeletons/OBJECT_IDENTIFIER.c @@ -652,7 +652,7 @@ OBJECT_IDENTIFIER_parse_arcs(const char *oid_text, ssize_t oid_txt_length, ST_LEADSPACE, ST_TAILSPACE, ST_AFTERVALUE, /* Next character ought to be '.' or a space */ - ST_WAITDIGITS, /* Next character is expected to be a digit */ + ST_WAITDIGITS /* Next character is expected to be a digit */ } state = ST_LEADSPACE; if(!oid_text || oid_txt_length < -1 || (arcs_slots && !arcs)) { diff --git a/skeletons/asn_codecs_prim.c b/skeletons/asn_codecs_prim.c index 8e604a49..3beb9f2a 100644 --- a/skeletons/asn_codecs_prim.c +++ b/skeletons/asn_codecs_prim.c @@ -15,7 +15,7 @@ ber_decode_primitive(asn_codec_ctx_t *opt_codec_ctx, void **sptr, const void *buf_ptr, size_t size, int tag_mode) { ASN__PRIMITIVE_TYPE_t *st = (ASN__PRIMITIVE_TYPE_t *)*sptr; asn_dec_rval_t rval; - ber_tlv_len_t length = 0; // =0 to avoid [incorrect] warning. + ber_tlv_len_t length = 0; /* =0 to avoid [incorrect] warning. */ /* * If the structure is not there, allocate it. diff --git a/skeletons/asn_internal.h b/skeletons/asn_internal.h index 7e0f71be..4242245a 100644 --- a/skeletons/asn_internal.h +++ b/skeletons/asn_internal.h @@ -59,7 +59,7 @@ void ASN_DEBUG_f(const char *fmt, ...); #define ASN_DEBUG ASN_DEBUG_f #endif /* __GNUC__ */ #else /* EMIT_ASN_DEBUG != 1 */ -static inline void ASN_DEBUG(const char *fmt, ...) { (void)fmt; } +static void ASN_DEBUG(const char *fmt, ...) { (void)fmt; } #endif /* EMIT_ASN_DEBUG */ #endif /* ASN_DEBUG */ @@ -101,7 +101,7 @@ static inline void ASN_DEBUG(const char *fmt, ...) { (void)fmt; } * Check stack against overflow, if limit is set. */ #define _ASN_DEFAULT_STACK_MAX (30000) -static inline int +static int __attribute__((unused)) _ASN_STACK_OVERFLOW_CHECK(asn_codec_ctx_t *ctx) { if(ctx && ctx->max_stack_size) { -- cgit v1.2.3