aboutsummaryrefslogtreecommitdiffstats
path: root/skeletons
diff options
context:
space:
mode:
Diffstat (limited to 'skeletons')
-rw-r--r--skeletons/BIT_STRING.c6
-rw-r--r--skeletons/OCTET_STRING.c4
-rw-r--r--skeletons/asn_application.h6
-rw-r--r--skeletons/asn_codecs.h6
-rw-r--r--skeletons/asn_internal.h22
-rw-r--r--skeletons/asn_system.h6
-rw-r--r--skeletons/constr_CHOICE.c4
-rw-r--r--skeletons/constr_SEQUENCE.c4
-rw-r--r--skeletons/constr_SEQUENCE_OF.c6
-rw-r--r--skeletons/constr_SET.c4
-rw-r--r--skeletons/constr_SET_OF.c6
-rw-r--r--skeletons/constraints.h6
12 files changed, 40 insertions, 40 deletions
diff --git a/skeletons/BIT_STRING.c b/skeletons/BIT_STRING.c
index 9e0e50c6..a19f50fb 100644
--- a/skeletons/BIT_STRING.c
+++ b/skeletons/BIT_STRING.c
@@ -103,7 +103,7 @@ BIT_STRING_encode_xer(asn_TYPE_descriptor_t *td, void *sptr,
er.encoded += p - scratch;
_ASN_CALLBACK(scratch, p - scratch);
p = scratch;
- if(nline) _i_ASN_TEXT_INDENT(1, ilevel);
+ if(nline) ASN__TEXT_INDENT(1, ilevel);
}
memcpy(p + 0, _bit_pattern[v >> 4], 4);
memcpy(p + 4, _bit_pattern[v & 0x0f], 4);
@@ -111,7 +111,7 @@ BIT_STRING_encode_xer(asn_TYPE_descriptor_t *td, void *sptr,
}
if(!xcan && ((buf - st->buf) % 8) == 0)
- _i_ASN_TEXT_INDENT(1, ilevel);
+ ASN__TEXT_INDENT(1, ilevel);
er.encoded += p - scratch;
_ASN_CALLBACK(scratch, p - scratch);
p = scratch;
@@ -126,7 +126,7 @@ BIT_STRING_encode_xer(asn_TYPE_descriptor_t *td, void *sptr,
_ASN_CALLBACK(scratch, p - scratch);
}
- if(!xcan) _i_ASN_TEXT_INDENT(1, ilevel - 1);
+ if(!xcan) ASN__TEXT_INDENT(1, ilevel - 1);
_ASN_ENCODED_OK(er);
cb_failed:
diff --git a/skeletons/OCTET_STRING.c b/skeletons/OCTET_STRING.c
index a8c0f7f3..5d603290 100644
--- a/skeletons/OCTET_STRING.c
+++ b/skeletons/OCTET_STRING.c
@@ -619,7 +619,7 @@ OCTET_STRING_encode_xer(asn_TYPE_descriptor_t *td, void *sptr,
_ASN_CALLBACK(scratch, p-scratch);
er.encoded += (p-scratch);
p = scratch;
- _i_ASN_TEXT_INDENT(1, ilevel);
+ ASN__TEXT_INDENT(1, ilevel);
}
*p++ = h2c[(*buf >> 4) & 0x0F];
*p++ = h2c[*buf & 0x0F];
@@ -630,7 +630,7 @@ OCTET_STRING_encode_xer(asn_TYPE_descriptor_t *td, void *sptr,
_ASN_CALLBACK(scratch, p-scratch); /* Dump the rest */
er.encoded += p - scratch;
if(st->size > 16)
- _i_ASN_TEXT_INDENT(1, ilevel-1);
+ ASN__TEXT_INDENT(1, ilevel-1);
}
}
diff --git a/skeletons/asn_application.h b/skeletons/asn_application.h
index f40cd86a..71e9ba61 100644
--- a/skeletons/asn_application.h
+++ b/skeletons/asn_application.h
@@ -5,8 +5,8 @@
/*
* Application-level ASN.1 callbacks.
*/
-#ifndef _ASN_APPLICATION_H_
-#define _ASN_APPLICATION_H_
+#ifndef ASN_APPLICATION_H
+#define ASN_APPLICATION_H
#include "asn_system.h" /* for platform-dependent types */
#include "asn_codecs.h" /* for ASN.1 codecs specifics */
@@ -44,4 +44,4 @@ typedef void (asn_app_constraint_failed_f)(void *application_specific_key,
#include "constr_TYPE.h" /* for asn_TYPE_descriptor_t */
-#endif /* _ASN_APPLICATION_H_ */
+#endif /* ASN_APPLICATION_H */
diff --git a/skeletons/asn_codecs.h b/skeletons/asn_codecs.h
index e5600142..f2b8489f 100644
--- a/skeletons/asn_codecs.h
+++ b/skeletons/asn_codecs.h
@@ -3,8 +3,8 @@
* All rights reserved.
* Redistribution and modifications are permitted subject to BSD license.
*/
-#ifndef _ASN_CODECS_H_
-#define _ASN_CODECS_H_
+#ifndef ASN_CODECS_H
+#define ASN_CODECS_H
#ifdef __cplusplus
extern "C" {
@@ -106,4 +106,4 @@ typedef struct asn_dec_rval_s {
}
#endif
-#endif /* _ASN_CODECS_H_ */
+#endif /* ASN_CODECS_H */
diff --git a/skeletons/asn_internal.h b/skeletons/asn_internal.h
index bd7a373f..b7faefbf 100644
--- a/skeletons/asn_internal.h
+++ b/skeletons/asn_internal.h
@@ -6,8 +6,8 @@
/*
* 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 */
@@ -66,20 +66,20 @@ static void ASN_DEBUG(const char *fmt, ...) { (void)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 { \
+#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))
+ 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))
+ 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))
+ 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 { \
+#define ASN__TEXT_INDENT(nl, level) do { \
int tmp_level = (level); \
int tmp_nl = ((nl) != 0); \
int tmp_i; \
@@ -125,4 +125,4 @@ _ASN_STACK_OVERFLOW_CHECK(asn_codec_ctx_t *ctx) {
}
#endif
-#endif /* _ASN_INTERNAL_H_ */
+#endif /* ASN_INTERNAL_H */
diff --git a/skeletons/asn_system.h b/skeletons/asn_system.h
index e420ad2d..db230f85 100644
--- a/skeletons/asn_system.h
+++ b/skeletons/asn_system.h
@@ -6,8 +6,8 @@
/*
* Miscellaneous system-dependent types.
*/
-#ifndef _ASN_SYSTEM_H_
-#define _ASN_SYSTEM_H_
+#ifndef ASN_SYSTEM_H
+#define ASN_SYSTEM_H
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -126,4 +126,4 @@ typedef unsigned int uint32_t;
#endif /* __GNUC__ */
#endif /* MIN */
-#endif /* _ASN_SYSTEM_H_ */
+#endif /* ASN_SYSTEM_H */
diff --git a/skeletons/constr_CHOICE.c b/skeletons/constr_CHOICE.c
index b268788a..d463e8d2 100644
--- a/skeletons/constr_CHOICE.c
+++ b/skeletons/constr_CHOICE.c
@@ -806,7 +806,7 @@ CHOICE_encode_xer(asn_TYPE_descriptor_t *td, void *sptr,
er.encoded = 0;
- if(!(flags & XER_F_CANONICAL)) _i_ASN_TEXT_INDENT(1, ilevel);
+ if(!(flags & XER_F_CANONICAL)) ASN__TEXT_INDENT(1, ilevel);
_ASN_CALLBACK3("<", 1, mname, mlen, ">", 1);
tmper = elm->type->xer_encoder(elm->type, memb_ptr,
@@ -818,7 +818,7 @@ CHOICE_encode_xer(asn_TYPE_descriptor_t *td, void *sptr,
er.encoded += 5 + (2 * mlen) + tmper.encoded;
}
- if(!(flags & XER_F_CANONICAL)) _i_ASN_TEXT_INDENT(1, ilevel - 1);
+ if(!(flags & XER_F_CANONICAL)) ASN__TEXT_INDENT(1, ilevel - 1);
_ASN_ENCODED_OK(er);
cb_failed:
diff --git a/skeletons/constr_SEQUENCE.c b/skeletons/constr_SEQUENCE.c
index a8f5cf13..56400d5f 100644
--- a/skeletons/constr_SEQUENCE.c
+++ b/skeletons/constr_SEQUENCE.c
@@ -881,7 +881,7 @@ SEQUENCE_encode_xer(asn_TYPE_descriptor_t *td, void *sptr,
memb_ptr = (void *)((char *)sptr + elm->memb_offset);
}
- if(!xcan) _i_ASN_TEXT_INDENT(1, ilevel);
+ if(!xcan) ASN__TEXT_INDENT(1, ilevel);
_ASN_CALLBACK3("<", 1, mname, mlen, ">", 1);
/* Print the member itself */
@@ -893,7 +893,7 @@ SEQUENCE_encode_xer(asn_TYPE_descriptor_t *td, void *sptr,
er.encoded += 5 + (2 * mlen) + tmper.encoded;
}
- if(!xcan) _i_ASN_TEXT_INDENT(1, ilevel - 1);
+ if(!xcan) ASN__TEXT_INDENT(1, ilevel - 1);
_ASN_ENCODED_OK(er);
cb_failed:
diff --git a/skeletons/constr_SEQUENCE_OF.c b/skeletons/constr_SEQUENCE_OF.c
index aa101176..cba92424 100644
--- a/skeletons/constr_SEQUENCE_OF.c
+++ b/skeletons/constr_SEQUENCE_OF.c
@@ -111,7 +111,7 @@ SEQUENCE_OF_encode_xer(asn_TYPE_descriptor_t *td, void *sptr,
if(!memb_ptr) continue;
if(mname) {
- if(!xcan) _i_ASN_TEXT_INDENT(1, ilevel);
+ if(!xcan) ASN__TEXT_INDENT(1, ilevel);
_ASN_CALLBACK3("<", 1, mname, mlen, ">", 1);
}
@@ -121,7 +121,7 @@ SEQUENCE_OF_encode_xer(asn_TYPE_descriptor_t *td, void *sptr,
if(tmper.encoded == 0 && specs->as_XMLValueList) {
const char *name = elm->type->xml_tag;
size_t len = strlen(name);
- if(!xcan) _i_ASN_TEXT_INDENT(1, ilevel + 1);
+ if(!xcan) ASN__TEXT_INDENT(1, ilevel + 1);
_ASN_CALLBACK3("<", 1, name, len, "/>", 2);
}
@@ -133,7 +133,7 @@ SEQUENCE_OF_encode_xer(asn_TYPE_descriptor_t *td, void *sptr,
er.encoded += (2 * mlen) + tmper.encoded;
}
- if(!xcan) _i_ASN_TEXT_INDENT(1, ilevel - 1);
+ if(!xcan) ASN__TEXT_INDENT(1, ilevel - 1);
_ASN_ENCODED_OK(er);
cb_failed:
diff --git a/skeletons/constr_SET.c b/skeletons/constr_SET.c
index 83488d90..f2a585d6 100644
--- a/skeletons/constr_SET.c
+++ b/skeletons/constr_SET.c
@@ -842,7 +842,7 @@ SET_encode_xer(asn_TYPE_descriptor_t *td, void *sptr,
}
if(!xcan)
- _i_ASN_TEXT_INDENT(1, ilevel);
+ ASN__TEXT_INDENT(1, ilevel);
_ASN_CALLBACK3("<", 1, mname, mlen, ">", 1);
/* Print the member itself */
@@ -855,7 +855,7 @@ SET_encode_xer(asn_TYPE_descriptor_t *td, void *sptr,
er.encoded += 5 + (2 * mlen) + tmper.encoded;
}
- if(!xcan) _i_ASN_TEXT_INDENT(1, ilevel - 1);
+ if(!xcan) ASN__TEXT_INDENT(1, ilevel - 1);
_ASN_ENCODED_OK(er);
cb_failed:
diff --git a/skeletons/constr_SET_OF.c b/skeletons/constr_SET_OF.c
index e30e4a4f..de5e6287 100644
--- a/skeletons/constr_SET_OF.c
+++ b/skeletons/constr_SET_OF.c
@@ -691,12 +691,12 @@ SET_OF_encode_xer(asn_TYPE_descriptor_t *td, void *sptr,
}
if(mname) {
- if(!xcan) _i_ASN_TEXT_INDENT(1, ilevel);
+ if(!xcan) ASN__TEXT_INDENT(1, ilevel);
_ASN_CALLBACK3("<", 1, mname, mlen, ">", 1);
}
if(!xcan && specs->as_XMLValueList == 1)
- _i_ASN_TEXT_INDENT(1, ilevel + 1);
+ ASN__TEXT_INDENT(1, ilevel + 1);
tmper = elm->type->xer_encoder(elm->type, memb_ptr,
ilevel + (specs->as_XMLValueList != 2),
flags, cb, app_key);
@@ -719,7 +719,7 @@ SET_OF_encode_xer(asn_TYPE_descriptor_t *td, void *sptr,
er.encoded += (2 * mlen) + tmper.encoded;
}
- if(!xcan) _i_ASN_TEXT_INDENT(1, ilevel - 1);
+ if(!xcan) ASN__TEXT_INDENT(1, ilevel - 1);
if(encs) {
xer_tmp_enc_t *enc = encs;
diff --git a/skeletons/constraints.h b/skeletons/constraints.h
index 5032345e..f7813495 100644
--- a/skeletons/constraints.h
+++ b/skeletons/constraints.h
@@ -2,8 +2,8 @@
* Copyright (c) 2004, 2006 Lev Walkin <vlm@lionet.info>. All rights reserved.
* Redistribution and modifications are permitted subject to BSD license.
*/
-#ifndef _ASN1_CONSTRAINTS_VALIDATOR_H_
-#define _ASN1_CONSTRAINTS_VALIDATOR_H_
+#ifndef ASN1_CONSTRAINTS_VALIDATOR_H
+#define ASN1_CONSTRAINTS_VALIDATOR_H
#include <asn_system.h> /* Platform-dependent types */
@@ -60,4 +60,4 @@ asn_constr_check_f asn_generic_unknown_constraint; /* Not fully supported */
}
#endif
-#endif /* _ASN1_CONSTRAINTS_VALIDATOR_H_ */
+#endif /* ASN1_CONSTRAINTS_VALIDATOR_H */