Simplify notifiers.

[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 67f055a62fbf74c397d2c108469549291ef9e6af..9c94ca6c3b77b069c657d3c03ea0e3e650128747 100644 (file)
--- a/libs/smux/include/stg/asn_internal.h
+++ b/libs/smux/include/stg/asn_internal.h
@@ -1,13 +1,13 @@
 /*-
 /*-

- * Copyright (c) 2003, 2004, 2005 Lev Walkin <vlm@lionet.info>.
+ * Copyright (c) 2003, 2004, 2005, 2007 Lev Walkin <vlm@lionet.info>.

  * All rights reserved.
  * Redistribution and modifications are permitted subject to BSD license.
  */
 /*
  * Declarations internally useful for the ASN.1 support code.
  */
  * All rights reserved.
  * Redistribution and modifications are permitted subject to BSD license.
  */
 /*
  * Declarations internally useful for the ASN.1 support code.
  */

-#ifndef        _ASN_INTERNAL_H_
-#define        _ASN_INTERNAL_H_
+#ifndef        ASN_INTERNAL_H
+#define        ASN_INTERNAL_H

 
 #include "asn_application.h"   /* Application-visible API */
 
 
 #include "asn_application.h"   /* Application-visible API */
 


@@ -20,7 +20,7 @@ extern "C" {
 #endif
 
 /* Environment version might be used to avoid running with the old library */
 #endif
 
 /* Environment version might be used to avoid running with the old library */

-#define        ASN1C_ENVIRONMENT_VERSION       920     /* Compile-time version */
+#define        ASN1C_ENVIRONMENT_VERSION       923     /* Compile-time version */

 int get_asn1c_environment_version(void);       /* Run-time version */
 
 #define        CALLOC(nmemb, size)     calloc(nmemb, size)
 int get_asn1c_environment_version(void);       /* Run-time version */
 
 #define        CALLOC(nmemb, size)     calloc(nmemb, size)


@@ -28,6 +28,9 @@ int get_asn1c_environment_version(void);      /* Run-time version */
 #define        REALLOC(oldptr, size)   realloc(oldptr, size)
 #define        FREEMEM(ptr)            free(ptr)
 
 #define        REALLOC(oldptr, size)   realloc(oldptr, size)
 #define        FREEMEM(ptr)            free(ptr)
 

+#define        asn_debug_indent        0
+#define ASN_DEBUG_INDENT_ADD(i) do{}while(0)
+

 /*
  * A macro for debugging the ASN.1 internals.
  * You may enable or override it.
 /*
  * A macro for debugging the ASN.1 internals.
  * You may enable or override it.


@@ -35,59 +38,73 @@ int get_asn1c_environment_version(void);    /* Run-time version */
 #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__
 #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__

-#define        ASN_DEBUG(fmt, args...) do {            \
-               fprintf(stderr, fmt, ##args);   \
-               fprintf(stderr, " (%s:%d)\n",   \
-                       __FILE__, __LINE__);    \
+#ifdef ASN_THREAD_SAFE
+/* Thread safety requires sacrifice in output indentation:
+ * Retain empty definition of ASN_DEBUG_INDENT_ADD. */
+#else  /* !ASN_THREAD_SAFE */
+#undef  ASN_DEBUG_INDENT_ADD
+#undef  asn_debug_indent
+int asn_debug_indent;
+#define ASN_DEBUG_INDENT_ADD(i) do { asn_debug_indent += i; } while(0)
+#endif /* ASN_THREAD_SAFE */
+#define        ASN_DEBUG(fmt, args...) do {                    \
+               int adi = asn_debug_indent;             \
+               while(adi--) fprintf(stderr, " ");      \
+               fprintf(stderr, fmt, ##args);           \
+               fprintf(stderr, " (%s:%d)\n",           \
+                       __FILE__, __LINE__);            \

        } while(0)
 #else  /* !__GNUC__ */
 void ASN_DEBUG_f(const char *fmt, ...);
 #define        ASN_DEBUG       ASN_DEBUG_f
 #endif /* __GNUC__ */
 #else  /* EMIT_ASN_DEBUG != 1 */
        } while(0)
 #else  /* !__GNUC__ */
 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 */
 
 /*
  * Invoke the application-supplied callback and fail, if something is wrong.
  */
 #endif /* EMIT_ASN_DEBUG */
 #endif /* ASN_DEBUG */
 
 /*
  * 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 {                                    \
+#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)
                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__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        _i_ASN_TEXT_INDENT(nl, level) do {                              \
-       int __level = (level);                                          \
-       int __nl = ((nl) != 0);                                         \
-       int __i;                                                        \
-       if(__nl) _ASN_CALLBACK("\n", 1);                                \
-       for(__i = 0; __i < __level; __i++)                              \
-               _ASN_CALLBACK("    ", 4);                               \
-       er.encoded += __nl + 4 * __level;                               \
-} while(0)
+#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;       \
+    } while(0)

 
 

-#define        _i_INDENT(nl)   do {                                            \
-       int __i;                                                        \
-       if((nl) && cb("\n", 1, app_key) < 0) return -1;                 \
-       for(__i = 0; __i < ilevel; __i++)                               \
-               if(cb("    ", 4, app_key) < 0) return -1;               \
-} while(0)
+#define        _i_INDENT(nl)   do {                        \
+        int tmp_i;                                  \
+        if((nl) && cb("\n", 1, app_key) < 0)        \
+            return -1;                              \
+        for(tmp_i = 0; tmp_i < ilevel; tmp_i++)     \
+            if(cb("    ", 4, app_key) < 0)          \
+                return -1;                          \
+    } while(0)

 
 /*
  * Check stack against overflow, if limit is set.
  */
 
 /*
  * Check stack against overflow, if limit is set.
  */

-#define        _ASN_DEFAULT_STACK_MAX  (30000)
-static inline int
-_ASN_STACK_OVERFLOW_CHECK(asn_codec_ctx_t *ctx) {
+#define        ASN__DEFAULT_STACK_MAX  (30000)
+static int __attribute__((unused))
+ASN__STACK_OVERFLOW_CHECK(asn_codec_ctx_t *ctx) {

        if(ctx && ctx->max_stack_size) {
 
                /* ctx MUST be allocated on the stack */
        if(ctx && ctx->max_stack_size) {
 
                /* ctx MUST be allocated on the stack */


@@ -108,4 +125,4 @@ _ASN_STACK_OVERFLOW_CHECK(asn_codec_ctx_t *ctx) {
 }
 #endif
 
 }
 #endif
 

-#endif /* _ASN_INTERNAL_H_ */
+#endif /* ASN_INTERNAL_H */