Regen SMUX support library with more recent ASN1 compiler.

[stg.git] / libs / smux / include / stg / asn_internal.h

diff --git a/libs/smux/include/stg/asn_internal.h b/libs/smux/include/stg/asn_internal.h
index 9c94ca6c3b77b069c657d3c03ea0e3e650128747..4e72d62f30addb09bc9fd92c354ff1233d321e69 100644 (file)
--- a/libs/smux/include/stg/asn_internal.h
+++ b/libs/smux/include/stg/asn_internal.h
@@ -1,6 +1,5 @@
-/*-
- * Copyright (c) 2003, 2004, 2005, 2007 Lev Walkin <vlm@lionet.info>.
- * All rights reserved.
+/*
+ * Copyright (c) 2003-2017 Lev Walkin <vlm@lionet.info>. All rights reserved.
  * Redistribution and modifications are permitted subject to BSD license.
  */
 /*
@@ -8,7 +7,9 @@
  */
 #ifndef        ASN_INTERNAL_H
 #define        ASN_INTERNAL_H
-
+#ifndef __EXTENSIONS__
+#define __EXTENSIONS__          /* for Sun */
+#endif
 #include "asn_application.h"   /* Application-visible API */
 
 #ifndef        __NO_ASSERT_H__         /* Include assert.h only for internal use. */
@@ -31,13 +32,18 @@ int get_asn1c_environment_version(void);    /* Run-time version */
 #define        asn_debug_indent        0
 #define ASN_DEBUG_INDENT_ADD(i) do{}while(0)
 
+#ifdef  EMIT_ASN_DEBUG
+#warning "Use ASN_EMIT_DEBUG instead of EMIT_ASN_DEBUG"
+#define ASN_EMIT_DEBUG  EMIT_ASN_DEBUG
+#endif
+
 /*
  * A macro for debugging the ASN.1 internals.
  * You may enable or override it.
  */
 #ifndef        ASN_DEBUG       /* If debugging code is not defined elsewhere... */
-#if    EMIT_ASN_DEBUG == 1     /* And it was asked to emit this code... */
-#ifdef __GNUC__
+#if    ASN_EMIT_DEBUG == 1     /* And it was asked to emit this code... */
+#if __STDC_VERSION__ >= 199901L
 #ifdef ASN_THREAD_SAFE
 /* Thread safety requires sacrifice in output indentation:
  * Retain empty definition of ASN_DEBUG_INDENT_ADD. */
@@ -54,40 +60,58 @@ int asn_debug_indent;
                fprintf(stderr, " (%s:%d)\n",           \
                        __FILE__, __LINE__);            \
        } while(0)
-#else  /* !__GNUC__ */
-void ASN_DEBUG_f(const char *fmt, ...);
+#else  /* !C99 */
+void CC_PRINTFLIKE(1, 2) ASN_DEBUG_f(const char *fmt, ...);
 #define        ASN_DEBUG       ASN_DEBUG_f
-#endif /* __GNUC__ */
-#else  /* EMIT_ASN_DEBUG != 1 */
-static void ASN_DEBUG(const char *fmt, ...) { (void)fmt; }
-#endif /* EMIT_ASN_DEBUG */
+#endif /* C99 */
+#else  /* ASN_EMIT_DEBUG != 1 */
+#if __STDC_VERSION__ >= 199901L
+#define ASN_DEBUG(...) do{}while(0)
+#else   /* not C99 */
+static void CC_PRINTFLIKE(1, 2) ASN_DEBUG(const char *fmt, ...) { (void)fmt; }
+#endif  /* C99 or better */
+#endif /* ASN_EMIT_DEBUG */
 #endif /* ASN_DEBUG */
 
+/*
+ * Print to a callback.
+ * The callback is expected to return negative values on error.
+ * 0 and positive values are treated as success.
+ * RETURN VALUES:
+ *  -1: Failed to format or invoke the callback.
+ *  >0: Size of the data that got delivered to the callback.
+ */
+ssize_t CC_PRINTFLIKE(3, 4)
+asn__format_to_callback(
+    int (*callback)(const void *, size_t, void *key), void *key,
+    const char *fmt, ...);
+
 /*
  * Invoke the application-supplied callback and fail, if something is wrong.
  */
-#define        ASN__E_cbc(buf, size)   (cb((buf), (size), app_key) < 0)
-#define        ASN__E_CALLBACK(foo)    do {                                    \
-               if(foo) goto cb_failed;                                 \
-       } while(0)
-#define        ASN__CALLBACK(buf, size)                                        \
-       ASN__E_CALLBACK(ASN__E_cbc(buf, size))
-#define        ASN__CALLBACK2(buf1, size1, buf2, size2)                        \
-       ASN__E_CALLBACK(ASN__E_cbc(buf1, size1) || ASN__E_cbc(buf2, size2))
-#define        ASN__CALLBACK3(buf1, size1, buf2, size2, buf3, size3)           \
-       ASN__E_CALLBACK(ASN__E_cbc(buf1, size1)                 \
-               || ASN__E_cbc(buf2, size2)                              \
-               || ASN__E_cbc(buf3, size3))
-
-#define        ASN__TEXT_INDENT(nl, level) do {            \
-        int tmp_level = (level);                    \
-        int tmp_nl = ((nl) != 0);                   \
-        int tmp_i;                                  \
-        if(tmp_nl) ASN__CALLBACK("\n", 1);          \
-        if(tmp_level < 0) tmp_level = 0;            \
-        for(tmp_i = 0; tmp_i < tmp_level; tmp_i++)  \
-            ASN__CALLBACK("    ", 4);               \
-        er.encoded += tmp_nl + 4 * tmp_level;       \
+#define ASN__E_cbc(buf, size) (cb((buf), (size), app_key) < 0)
+#define ASN__E_CALLBACK(size, foo) \
+    do {                           \
+        if(foo) goto cb_failed;    \
+        er.encoded += (size);      \
+    } while(0)
+#define ASN__CALLBACK(buf, size) ASN__E_CALLBACK(size, ASN__E_cbc(buf, size))
+#define ASN__CALLBACK2(buf1, size1, buf2, size2) \
+    ASN__E_CALLBACK((size1) + (size2),           \
+                    ASN__E_cbc(buf1, size1) || ASN__E_cbc(buf2, size2))
+#define ASN__CALLBACK3(buf1, size1, buf2, size2, buf3, size3)          \
+    ASN__E_CALLBACK((size1) + (size2) + (size3),                       \
+                    ASN__E_cbc(buf1, size1) || ASN__E_cbc(buf2, size2) \
+                        || ASN__E_cbc(buf3, size3))
+
+#define ASN__TEXT_INDENT(nl, level)                                          \
+    do {                                                                     \
+        int tmp_level = (level);                                             \
+        int tmp_nl = ((nl) != 0);                                            \
+        int tmp_i;                                                           \
+        if(tmp_nl) ASN__CALLBACK("\n", 1);                                   \
+        if(tmp_level < 0) tmp_level = 0;                                     \
+        for(tmp_i = 0; tmp_i < tmp_level; tmp_i++) ASN__CALLBACK("    ", 4); \
     } while(0)
 
 #define        _i_INDENT(nl)   do {                        \
@@ -103,12 +127,12 @@ static void ASN_DEBUG(const char *fmt, ...) { (void)fmt; }
  * Check stack against overflow, if limit is set.
  */
 #define        ASN__DEFAULT_STACK_MAX  (30000)
-static int __attribute__((unused))
-ASN__STACK_OVERFLOW_CHECK(asn_codec_ctx_t *ctx) {
+static int CC_NOTUSED
+ASN__STACK_OVERFLOW_CHECK(const asn_codec_ctx_t *ctx) {
        if(ctx && ctx->max_stack_size) {
 
                /* ctx MUST be allocated on the stack */
-               ptrdiff_t usedstack = ((char *)ctx - (char *)&ctx);
+               ptrdiff_t usedstack = ((const char *)ctx - (const char *)&ctx);
                if(usedstack > 0) usedstack = -usedstack; /* grows up! */
 
                /* double negative required to avoid int wrap-around */