Skip to content

Commit

Permalink
do not use reserved identifiers
Browse files Browse the repository at this point in the history
  • Loading branch information
vlm committed Mar 14, 2016
1 parent 327bab2 commit c6cac8e
Show file tree
Hide file tree
Showing 37 changed files with 115 additions and 115 deletions.
6 changes: 3 additions & 3 deletions libasn1compiler/asn1c_constraint.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#ifndef _ASN1C_CONSTRAINT_H_
#define _ASN1C_CONSTRAINT_H_
#ifndef ASN1C_CONSTRAINT_H
#define ASN1C_CONSTRAINT_H

int asn1c_emit_constraint_checking_code(arg_t *arg);

#endif /* _ASN1C_CONSTRAINT_H_ */
#endif /* ASN1C_CONSTRAINT_H */
6 changes: 3 additions & 3 deletions libasn1compiler/asn1c_fdeps.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _ASN1C_FDEPS_H_
#define _ASN1C_FDEPS_H_
#ifndef ASN1C_FDEPS_H
#define ASN1C_FDEPS_H

typedef struct asn1c_fdeps_s {
char *filename; /* Or 0, if root. */
Expand All @@ -26,4 +26,4 @@ int asn1c_activate_dependency(asn1c_fdeps_t *deps, asn1c_fdeps_t *cur,

asn1c_fdeps_t *asn1c_deps_makelist(asn1c_fdeps_t *deps);

#endif /* _ASN1C_FDEPS_H_ */
#endif /* ASN1C_FDEPS_H */
6 changes: 3 additions & 3 deletions libasn1compiler/asn1c_internal.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _ASN1_COMPILER_INTERNAL_H_
#define _ASN1_COMPILER_INTERNAL_H_
#ifndef ASN1_COMPILER_INTERNAL_H
#define ASN1_COMPILER_INTERNAL_H

#ifdef HAVE_CONFIG_H
#include <config.h>
Expand Down Expand Up @@ -70,4 +70,4 @@ typedef struct arg_s {
#define WARNING(fmt, args...) LOG(0, fmt, ##args);
#define FATAL(fmt, args...) LOG(1, fmt, ##args);

#endif /* _ASN1_COMPILER_INTERNAL_H_ */
#endif /* ASN1_COMPILER_INTERNAL_H */
6 changes: 3 additions & 3 deletions libasn1compiler/asn1c_misc.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _ASN1_COMPILER_MISC_H_
#define _ASN1_COMPILER_MISC_H_
#ifndef ASN1_COMPILER_MISC_H
#define ASN1_COMPILER_MISC_H

/*
* Make the target language identifier out of one or more names.
Expand Down Expand Up @@ -42,4 +42,4 @@ enum asn1c_fitslong_e {
};
enum asn1c_fitslong_e asn1c_type_fits_long(arg_t *arg, asn1p_expr_t *expr);

#endif /* _ASN1_COMPILER_MISC_H_ */
#endif /* ASN1_COMPILER_MISC_H */
6 changes: 3 additions & 3 deletions libasn1compiler/asn1c_out.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _ASN1_COMPILED_OUTPUT_H_
#define _ASN1_COMPILED_OUTPUT_H_
#ifndef ASN1_COMPILED_OUTPUT_H
#define ASN1_COMPILED_OUTPUT_H

/*
* An elementary chunk of target language text.
Expand Down Expand Up @@ -130,4 +130,4 @@ int asn1c_compiled_output(arg_t *arg, const char *fmt, ...);
OUT("% " PRIdASN, iv); \
} while(0)

#endif /* _ASN1_COMPILED_OUTPUT_H_ */
#endif /* ASN1_COMPILED_OUTPUT_H */
6 changes: 3 additions & 3 deletions libasn1compiler/asn1c_save.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef _ASN1C_SAVE_H_
#define _ASN1C_SAVE_H_
#ifndef ASN1C_SAVE_H
#define ASN1C_SAVE_H

int asn1c_save_compiled_output(arg_t *arg, const char *datadir,
int argc, int optc, char **argv);

#endif /* _ASN1C_SAVE_H_ */
#endif /* ASN1C_SAVE_H */
6 changes: 3 additions & 3 deletions libasn1fix/asn1fix_bitstring.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#ifndef _ASN1FIX_BIT_STRING_H_
#define _ASN1FIX_BIT_STRING_H_
#ifndef ASN1FIX_BIT_STRING_H
#define ASN1FIX_BIT_STRING_H

int asn1f_fix_bit_string(arg_t *);

#endif /* _ASN1FIX_BIT_STRING_H_ */
#endif /* ASN1FIX_BIT_STRING_H */
6 changes: 3 additions & 3 deletions libasn1fix/asn1fix_class.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#ifndef _ASN1FIX_CLASS_H_
#define _ASN1FIX_CLASS_H_
#ifndef ASN1FIX_CLASS_H
#define ASN1FIX_CLASS_H

/*
* Fetch the element from the class-related stuff (thing) by its reference.
*/
asn1p_expr_t *asn1f_class_access(arg_t *, asn1p_module_t *mod, asn1p_expr_t *rhs_pspecs, asn1p_ref_t *);

#endif /* _ASN1FIX_CLASS_H_ */
#endif /* ASN1FIX_CLASS_H */
6 changes: 3 additions & 3 deletions libasn1fix/asn1fix_compat.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _ASN1FIX_COMPAT_H_
#define _ASN1FIX_COMPAT_H_
#ifndef ASN1FIX_COMPAT_H
#define ASN1FIX_COMPAT_H

/*
* Check that the expressions given are compatible in their type.
Expand All @@ -11,4 +11,4 @@ int asn1f_check_type_compatibility(arg_t *arg,
asn1p_expr_t *a,
asn1p_expr_t *b);

#endif /* _ASN1FIX_COMPAT_H_ */
#endif /* ASN1FIX_COMPAT_H */
6 changes: 3 additions & 3 deletions libasn1fix/asn1fix_constr.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _ASN1FIX_CONSTRUCTED_H_
#define _ASN1FIX_CONSTRUCTED_H_
#ifndef ASN1FIX_CONSTRUCTED_H
#define ASN1FIX_CONSTRUCTED_H

/*
* Pull in COMPONENTS OF.
Expand All @@ -26,4 +26,4 @@ int asn1f_check_constr_tags_distinct(arg_t *);
*/
int asn1f_fix_constr_autotag(arg_t *);

#endif /* _ASN1FIX_CONSTRUCTED_H_ */
#endif /* ASN1FIX_CONSTRUCTED_H */
6 changes: 3 additions & 3 deletions libasn1fix/asn1fix_constraint.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _ASN1FIX_CONSTRAINT_H_
#define _ASN1FIX_CONSTRAINT_H_
#ifndef ASN1FIX_CONSTRAINT_H
#define ASN1FIX_CONSTRAINT_H

/*
* Resolve referenced values inside constraints.
Expand All @@ -16,4 +16,4 @@ int asn1constraint_resolve(arg_t *arg, asn1p_constraint_t *ct,
*/
int asn1constraint_pullup(arg_t *arg);

#endif /* _ASN1FIX_CONSTRAINT_H_ */
#endif /* ASN1FIX_CONSTRAINT_H */
6 changes: 3 additions & 3 deletions libasn1fix/asn1fix_cstring.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#ifndef _ASN1FIX_CSTRING_H_
#define _ASN1FIX_CSTRING_H_
#ifndef ASN1FIX_CSTRING_H
#define ASN1FIX_CSTRING_H

int asn1f_fix_cstring(arg_t *);

#endif /* _ASN1FIX_CSTRING_H_ */
#endif /* ASN1FIX_CSTRING_H */
6 changes: 3 additions & 3 deletions libasn1fix/asn1fix_cws.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#ifndef _ASN1FIX_CLASS_WITH_SYNTAX_H_
#define _ASN1FIX_CLASS_WITH_SYNTAX_H_
#ifndef ASN1FIX_CLASS_WITH_SYNTAX_H
#define ASN1FIX_CLASS_WITH_SYNTAX_H

/*
* Parse class objects
*/
int asn1f_parse_class_object(arg_t *arg);

#endif /* _ASN1FIX_CLASS_WITH_SYNTAX_H_ */
#endif /* ASN1FIX_CLASS_WITH_SYNTAX_H */
6 changes: 3 additions & 3 deletions libasn1fix/asn1fix_dereft.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#ifndef _ASN1FIX_DEREFT_H_
#define _ASN1FIX_DEREFT_H_
#ifndef ASN1FIX_DEREFT_H
#define ASN1FIX_DEREFT_H

int asn1f_fix_dereference_types(arg_t *);

#endif /* _ASN1FIX_DEREFT_H_ */
#endif /* ASN1FIX_DEREFT_H */
6 changes: 3 additions & 3 deletions libasn1fix/asn1fix_derefv.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef _ASN1FIX_DEREFV_H_
#define _ASN1FIX_DEREFV_H_
#ifndef ASN1FIX_DEREFV_H
#define ASN1FIX_DEREFV_H

int asn1f_fix_dereference_values(arg_t *);

int asn1f_fix_dereference_defaults(arg_t *);

#endif /* _ASN1FIX_DEREFV_H_ */
#endif /* ASN1FIX_DEREFV_H */
6 changes: 3 additions & 3 deletions libasn1fix/asn1fix_enum.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#ifndef _ASN1FIX_ENUM_H_
#define _ASN1FIX_ENUM_H_
#ifndef ASN1FIX_ENUM_H
#define ASN1FIX_ENUM_H

int asn1f_fix_enum(arg_t *); /* Enumeration ::= ENUMERATED { a(1), b(2) } */

#endif /* _ASN1FIX_ENUM_H_ */
#endif /* ASN1FIX_ENUM_H */
6 changes: 3 additions & 3 deletions libasn1fix/asn1fix_export.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
* This header exports fixer procedures that are common enough to be used
* in other modules.
*/
#ifndef _ASN1FIX_EXPORT_H_
#define _ASN1FIX_EXPORT_H_
#ifndef ASN1FIX_EXPORT_H
#define ASN1FIX_EXPORT_H

#include "asn1fix_tags.h"

Expand Down Expand Up @@ -38,4 +38,4 @@ asn1p_expr_t *asn1f_find_terminal_type_ex(asn1p_t *asn, asn1p_expr_t *tc);
int asn1f_fix_dereference_values_ex(asn1p_t *asn, asn1p_module_t *mod,
asn1p_expr_t *expr);

#endif /* _ASN1FIX_EXPORT_H_ */
#endif /* ASN1FIX_EXPORT_H */
6 changes: 3 additions & 3 deletions libasn1fix/asn1fix_integer.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#ifndef _ASN1FIX_INTEGER_H_
#define _ASN1FIX_INTEGER_H_
#ifndef ASN1FIX_INTEGER_H
#define ASN1FIX_INTEGER_H

int asn1f_fix_integer(arg_t *); /* Type1 ::= INTEGER { a(1), b(2) } */

#endif /* _ASN1FIX_INTEGER_H_ */
#endif /* ASN1FIX_INTEGER_H */
6 changes: 3 additions & 3 deletions libasn1fix/asn1fix_internal.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _ASN1FIX_INTERNAL_H_
#define _ASN1FIX_INTERNAL_H_
#ifndef ASN1FIX_INTERNAL_H
#define ASN1FIX_INTERNAL_H

#ifdef HAVE_CONFIG_H
#include <config.h>
Expand Down Expand Up @@ -135,4 +135,4 @@ typedef struct arg_s {
#endif


#endif /* _ASN1FIX_INTERNAL_H_ */
#endif /* ASN1FIX_INTERNAL_H */
6 changes: 3 additions & 3 deletions libasn1fix/asn1fix_misc.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Miscellaneous functions necessary for several other modules.
*/
#ifndef _ASN1FIX_MISC_H_
#define _ASN1FIX_MISC_H_
#ifndef ASN1FIX_MISC_H
#define ASN1FIX_MISC_H

/*
* Recursively invoke a given function over the given expr and all its
Expand Down Expand Up @@ -35,4 +35,4 @@ int asn1f_count_children(asn1p_expr_t *parent);
*/
int asn1f_check_known_external_type(const char *);

#endif /* _ASN1FIX_MISC_H_ */
#endif /* ASN1FIX_MISC_H */
6 changes: 3 additions & 3 deletions libasn1fix/asn1fix_param.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#ifndef _ASN1FIX_PARAMETERIZATION_H_
#define _ASN1FIX_PARAMETERIZATION_H_
#ifndef ASN1FIX_PARAMETERIZATION_H
#define ASN1FIX_PARAMETERIZATION_H

asn1p_expr_t *asn1f_parameterization_fork(arg_t *arg, asn1p_expr_t *expr, asn1p_expr_t *rhs_pspecs);

#endif /* _ASN1FIX_PARAMETERIZATION_H_ */
#endif /* ASN1FIX_PARAMETERIZATION_H */
6 changes: 3 additions & 3 deletions libasn1fix/asn1fix_retrieve.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Miscellaneous functions necessary for several other modules.
*/
#ifndef _ASN1FIX_RETRIEVE_H_
#define _ASN1FIX_RETRIEVE_H_
#ifndef ASN1FIX_RETRIEVE_H
#define ASN1FIX_RETRIEVE_H

/*
* Simple search for the label in the descendants of the given node.
Expand Down Expand Up @@ -68,4 +68,4 @@ asn1p_expr_t *asn1f_find_terminal_type(arg_t *arg, asn1p_expr_t *tc);
*/
asn1p_expr_t *asn1f_find_terminal_value(arg_t *arg, asn1p_expr_t *tc);

#endif /* _ASN1FIX_RETRIEVE_H_ */
#endif /* ASN1FIX_RETRIEVE_H */
6 changes: 3 additions & 3 deletions libasn1fix/asn1fix_tags.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _ASN1FIX_TAGS_H_
#define _ASN1FIX_TAGS_H_
#ifndef ASN1FIX_TAGS_H
#define ASN1FIX_TAGS_H

enum asn1f_aft_flags_e {
AFT_IMAGINARY_ANY = 0x01, /* Treat ANY tag as [IMAGINARY ANY] */
Expand Down Expand Up @@ -27,4 +27,4 @@ int asn1f_fetch_tags(asn1p_t *asn, asn1p_module_t *mod, asn1p_expr_t *expr,
*/
int asn1f_fetch_outmost_tag(asn1p_t *asn, asn1p_module_t *mod, asn1p_expr_t *expr, struct asn1p_type_tag_s *tag, enum asn1f_aft_flags_e);

#endif /* _ASN1FIX_TAGS_H_ */
#endif /* ASN1FIX_TAGS_H */
6 changes: 3 additions & 3 deletions libasn1fix/asn1fix_value.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Functions related with processing values.
*/
#ifndef _ASN1FIX_VALUE_H_
#define _ASN1FIX_VALUE_H_
#ifndef ASN1FIX_VALUE_H
#define ASN1FIX_VALUE_H

/*
* Resolve the value given by reference.
Expand All @@ -26,4 +26,4 @@ int asn1f_value_resolve(arg_t *arg, asn1p_expr_t *tc,
int asn1f_look_value_in_type(arg_t *arg,
asn1p_expr_t *type_expr, asn1p_expr_t *value_expr);

#endif /* _ASN1FIX_VALUE_H_ */
#endif /* ASN1FIX_VALUE_H */
6 changes: 3 additions & 3 deletions libasn1print/asn1print.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _ASN1PRINT_H_
#define _ASN1PRINT_H_
#ifndef ASN1PRINT_H
#define ASN1PRINT_H

enum asn1print_flags {
APF_NOFLAGS,
Expand All @@ -16,4 +16,4 @@ enum asn1print_flags {
int asn1print(asn1p_t *asn, enum asn1print_flags flags);


#endif /* _ASN1PRINT_H_ */
#endif /* ASN1PRINT_H */
6 changes: 3 additions & 3 deletions skeletons/BIT_STRING.c
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,15 @@ 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);
p += 8;
}

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;
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions skeletons/OCTET_STRING.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand All @@ -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);
}
}

Expand Down
6 changes: 3 additions & 3 deletions skeletons/asn_application.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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 */
Loading

0 comments on commit c6cac8e

Please sign in to comment.