reheaderization

git-svn-id: https://asn1c.svn.sourceforge.net/svnroot/asn1c/trunk@394 59561ff5-6e30-0410-9f3c-9617f08c8826
This commit is contained in:
vlm 2004-09-24 21:00:50 +00:00
parent eda244a429
commit d157958dc7
42 changed files with 40 additions and 64 deletions

View File

@ -216,7 +216,7 @@ asn1c_save_streams(arg_t *arg, asn1c_fdeps_t *deps) {
fprintf(fp_h, "#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n");
fprintf(fp_h, "#include <constr_TYPE.h>\n\n");
fprintf(fp_h, "#include <asn_application.h>\n\n");
TQ_FOR(ot, &(cs->destination[OT_INCLUDES].chunks), next) {
asn1c_activate_dependency(deps, 0, ot->buf);

View File

@ -5,7 +5,6 @@
#ifndef ASN_TYPE_ANY_H
#define ASN_TYPE_ANY_H
#include <constr_TYPE.h>
#include <OCTET_STRING.h> /* Implemented via OCTET SRING type */
typedef struct ANY {

View File

@ -5,10 +5,9 @@
#ifndef _BIT_STRING_H_
#define _BIT_STRING_H_
#include <constr_TYPE.h>
#include <OCTET_STRING.h>
typedef OCTET_STRING_t BIT_STRING_t; /* Implemented in terms of OCTET STRING */
typedef OCTET_STRING_t BIT_STRING_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_BIT_STRING;

View File

@ -5,10 +5,9 @@
#ifndef _BMPString_H_
#define _BMPString_H_
#include <constr_TYPE.h>
#include <OCTET_STRING.h>
typedef OCTET_STRING_t BMPString_t; /* Implemented in terms of OCTET STRING */
typedef OCTET_STRING_t BMPString_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_BMPString;

View File

@ -5,7 +5,7 @@
#ifndef _BOOLEAN_H_
#define _BOOLEAN_H_
#include <constr_TYPE.h>
#include <asn_application.h>
/*
* The underlying integer may contain various values, but everything

View File

@ -5,10 +5,9 @@
#ifndef _ENUMERATED_H_
#define _ENUMERATED_H_
#include <constr_TYPE.h>
#include <INTEGER.h>
typedef INTEGER_t ENUMERATED_t; /* Implemented in terms of INTEGER */
typedef INTEGER_t ENUMERATED_t; /* Implemented via INTEGER */
extern asn1_TYPE_descriptor_t asn1_DEF_ENUMERATED;

View File

@ -5,10 +5,9 @@
#ifndef _GeneralString_H_
#define _GeneralString_H_
#include <constr_TYPE.h>
#include <OCTET_STRING.h>
typedef OCTET_STRING_t GeneralString_t; /* Implemented in terms of OCTET STRING */
typedef OCTET_STRING_t GeneralString_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_GeneralString;

View File

@ -5,10 +5,9 @@
#ifndef _GeneralizedTime_H_
#define _GeneralizedTime_H_
#include <constr_TYPE.h>
#include <OCTET_STRING.h>
typedef OCTET_STRING_t GeneralizedTime_t; /* Implemented using OCTET STRING */
typedef OCTET_STRING_t GeneralizedTime_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_GeneralizedTime;

View File

@ -5,10 +5,9 @@
#ifndef _GraphicString_H_
#define _GraphicString_H_
#include <constr_TYPE.h>
#include <OCTET_STRING.h>
typedef OCTET_STRING_t GraphicString_t; /* Implemented in terms of OCTET STRING */
typedef OCTET_STRING_t GraphicString_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_GraphicString;

View File

@ -5,10 +5,9 @@
#ifndef _IA5String_H_
#define _IA5String_H_
#include <constr_TYPE.h>
#include <OCTET_STRING.h>
typedef OCTET_STRING_t IA5String_t; /* Implemented in terms of OCTET STRING */
typedef OCTET_STRING_t IA5String_t; /* Implemented via OCTET STRING */
/*
* IA5String ASN.1 type definition.

View File

@ -5,7 +5,7 @@
#ifndef _INTEGER_H_
#define _INTEGER_H_
#include <constr_TYPE.h>
#include <asn_application.h>
typedef struct INTEGER {
uint8_t *buf; /* Buffer with consecutive INTEGER bits (big-endian) */

View File

@ -5,7 +5,7 @@
#ifndef _ISO646String_H_
#define _ISO646String_H_
#include <constr_TYPE.h>
#include <asn_application.h>
#include <VisibleString.h>
typedef VisibleString_t ISO646String_t; /* Implemented using VisibleString */

View File

@ -5,7 +5,7 @@
#ifndef ASN_TYPE_NULL_H
#define ASN_TYPE_NULL_H
#include <constr_TYPE.h>
#include <asn_application.h>
/*
* The value of the NULL type is meaningless: see BOOLEAN if you want to

View File

@ -12,7 +12,7 @@
#ifndef _NativeInteger_H_
#define _NativeInteger_H_
#include <constr_TYPE.h>
#include <asn_application.h>
extern asn1_TYPE_descriptor_t asn1_DEF_NativeInteger;

View File

@ -11,7 +11,7 @@
#ifndef ASN_TYPE_NativeReal_H
#define ASN_TYPE_NativeReal_H
#include <constr_TYPE.h>
#include <asn_application.h>
extern asn1_TYPE_descriptor_t asn1_DEF_NativeReal;

View File

@ -5,10 +5,9 @@
#ifndef _NumericString_H_
#define _NumericString_H_
#include <constr_TYPE.h>
#include <OCTET_STRING.h>
typedef OCTET_STRING_t NumericString_t; /* Implemented in terms of OCTET STRING */
typedef OCTET_STRING_t NumericString_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_NumericString;

View File

@ -5,10 +5,9 @@
#ifndef _OBJECT_IDENTIFIER_H_
#define _OBJECT_IDENTIFIER_H_
#include <constr_TYPE.h>
#include <INTEGER.h>
typedef INTEGER_t OBJECT_IDENTIFIER_t; /* Implemented in terms of INTEGER */
typedef INTEGER_t OBJECT_IDENTIFIER_t; /* Implemented via INTEGER */
extern asn1_TYPE_descriptor_t asn1_DEF_OBJECT_IDENTIFIER;

View File

@ -5,7 +5,7 @@
#ifndef _OCTET_STRING_H_
#define _OCTET_STRING_H_
#include <constr_TYPE.h>
#include <asn_application.h>
typedef struct OCTET_STRING {
uint8_t *buf; /* Buffer with consecutive OCTET_STRING bits */

View File

@ -5,10 +5,9 @@
#ifndef _ObjectDescriptor_H_
#define _ObjectDescriptor_H_
#include <constr_TYPE.h>
#include <GraphicString.h>
typedef GraphicString_t ObjectDescriptor_t; /* Implemented in terms of. */
typedef GraphicString_t ObjectDescriptor_t; /* Implemented via GraphicString */
extern asn1_TYPE_descriptor_t asn1_DEF_ObjectDescriptor;

View File

@ -5,10 +5,9 @@
#ifndef _PrintableString_H_
#define _PrintableString_H_
#include <constr_TYPE.h>
#include <OCTET_STRING.h>
typedef OCTET_STRING_t PrintableString_t; /* Implemented in terms of OCTET STRING */
typedef OCTET_STRING_t PrintableString_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_PrintableString;

View File

@ -5,7 +5,7 @@
#ifndef ASN_TYPE_REAL_H
#define ASN_TYPE_REAL_H
#include <constr_TYPE.h>
#include <asn_application.h>
typedef struct REAL {
uint8_t *buf; /* Buffer with REAL type encoding */

View File

@ -5,10 +5,9 @@
#ifndef _RELATIVE_OID_H_
#define _RELATIVE_OID_H_
#include <constr_TYPE.h>
#include <OBJECT_IDENTIFIER.h>
/* Implemented in terms of OBJECT IDENTIFIER */
/* Implemented via OBJECT IDENTIFIER */
typedef OBJECT_IDENTIFIER_t RELATIVE_OID_t;
extern asn1_TYPE_descriptor_t asn1_DEF_RELATIVE_OID;

View File

@ -5,10 +5,9 @@
#ifndef _T61String_H_
#define _T61String_H_
#include <constr_TYPE.h>
#include <OCTET_STRING.h>
typedef OCTET_STRING_t T61String_t; /* Implemented in terms of OCTET STRING */
typedef OCTET_STRING_t T61String_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_T61String;

View File

@ -5,10 +5,9 @@
#ifndef _TeletexString_H_
#define _TeletexString_H_
#include <constr_TYPE.h>
#include <OCTET_STRING.h>
typedef OCTET_STRING_t TeletexString_t; /* Implemented in terms of OCTET STRING */
typedef OCTET_STRING_t TeletexString_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_TeletexString;

View File

@ -5,10 +5,9 @@
#ifndef _UTCTime_H_
#define _UTCTime_H_
#include <constr_TYPE.h>
#include <OCTET_STRING.h>
typedef OCTET_STRING_t UTCTime_t; /* Implemented using OCTET STRING */
typedef OCTET_STRING_t UTCTime_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_UTCTime;

View File

@ -5,10 +5,9 @@
#ifndef _UTF8String_H_
#define _UTF8String_H_
#include <constr_TYPE.h>
#include <OCTET_STRING.h>
typedef OCTET_STRING_t UTF8String_t; /* Implemented in terms of OCTET STRING */
typedef OCTET_STRING_t UTF8String_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_UTF8String;

View File

@ -5,10 +5,9 @@
#ifndef _UniversalString_H_
#define _UniversalString_H_
#include <constr_TYPE.h>
#include <OCTET_STRING.h>
typedef OCTET_STRING_t UniversalString_t; /* Implemented in terms of OCTET STRING */
typedef OCTET_STRING_t UniversalString_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_UniversalString;

View File

@ -5,10 +5,9 @@
#ifndef _VideotexString_H_
#define _VideotexString_H_
#include <constr_TYPE.h>
#include <OCTET_STRING.h>
typedef OCTET_STRING_t VideotexString_t; /* Implemented in terms of OCTET STRING */
typedef OCTET_STRING_t VideotexString_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_VideotexString;

View File

@ -5,10 +5,9 @@
#ifndef _VisibleString_H_
#define _VisibleString_H_
#include <constr_TYPE.h>
#include <OCTET_STRING.h>
typedef OCTET_STRING_t VisibleString_t; /* Implemented in terms of OCTET STRING */
typedef OCTET_STRING_t VisibleString_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_VisibleString;

View File

@ -5,7 +5,7 @@
#ifndef _BER_DECODER_H_
#define _BER_DECODER_H_
#include <constr_TYPE.h>
#include <asn_application.h>
struct asn1_TYPE_descriptor_s; /* Forward declaration */
@ -68,7 +68,7 @@ typedef ber_dec_rval_t (ber_type_decoder_f)(
* head->last_tag_form is non-zero.
*/
ber_dec_rval_t ber_check_tags(struct asn1_TYPE_descriptor_s *type_dsc,
ber_dec_ctx_t *ctx, /* saved context */
ber_dec_ctx_t *opt_ctx, /* saved context */
void *ptr, size_t size,
int tag_mode, /* {-1,0,1}: IMPLICIT, no, EXPLICIT */
ber_tlv_len_t *last_length,

View File

@ -5,7 +5,7 @@
#ifndef _CONSTR_CHOICE_H_
#define _CONSTR_CHOICE_H_
#include <constr_TYPE.h>
#include <asn_application.h>
typedef struct asn1_CHOICE_specifics_s {
/*

View File

@ -5,7 +5,7 @@
#ifndef _CONSTR_SEQUENCE_H_
#define _CONSTR_SEQUENCE_H_
#include <constr_TYPE.h>
#include <asn_application.h>
typedef struct asn1_SEQUENCE_specifics_s {
/*

View File

@ -5,7 +5,7 @@
#ifndef _CONSTR_SEQUENCE_OF_H_
#define _CONSTR_SEQUENCE_OF_H_
#include <constr_TYPE.h>
#include <asn_application.h>
#include <constr_SET_OF.h> /* Implemented using SET OF */
/*

View File

@ -5,7 +5,7 @@
#ifndef _CONSTR_SET_H_
#define _CONSTR_SET_H_
#include <constr_TYPE.h>
#include <asn_application.h>
typedef struct asn1_SET_specifics_s {

View File

@ -5,7 +5,7 @@
#ifndef _CONSTR_SET_OF_H_
#define _CONSTR_SET_OF_H_
#include <constr_TYPE.h>
#include <asn_application.h>
typedef struct asn1_SET_OF_specifics_s {
/*

View File

@ -11,8 +11,6 @@
#ifndef _CONSTR_TYPE_H
#define _CONSTR_TYPE_H
#include <asn_types.h> /* System-dependent types */
struct asn1_TYPE_descriptor_s; /* Forward declaration */
struct asn1_TYPE_member_s; /* Forward declaration */

View File

@ -1,6 +1,5 @@
#include <asn_internal.h>
#include <constraints.h>
#include <constr_TYPE.h>
int
asn_generic_no_constraint(asn1_TYPE_descriptor_t *type_descriptor,

View File

@ -3,7 +3,6 @@
* Redistribution and modifications are permitted subject to BSD license.
*/
#include <asn_internal.h>
#include <constr_TYPE.h>
#include <assert.h>
#include <errno.h>

View File

@ -5,7 +5,7 @@
#ifndef _DER_ENCODER_H_
#define _DER_ENCODER_H_
#include <constr_TYPE.h>
#include <asn_application.h>
struct asn1_TYPE_descriptor_s; /* Forward declaration */

View File

@ -43,8 +43,9 @@ constr_SET.h constr_SET.c
constr_SET_OF.h constr_SET_OF.c asn_SET_OF.h
COMMON-FILES: # This is a special section
asn_types.h
asn_application.h
asn_internal.h
asn_types.h
OCTET_STRING.h OCTET_STRING.c # This one is used too widely
ber_decoder.h ber_decoder.c
ber_tlv_length.h ber_tlv_length.c

View File

@ -3,7 +3,6 @@
* Redistribution and modifications are permitted subject to BSD license.
*/
#include <asn_internal.h>
#include <constr_TYPE.h>
#include <stdio.h>
#include <assert.h>
#include <errno.h>
@ -43,7 +42,7 @@ xer_encode(asn1_TYPE_descriptor_t *td, void *sptr,
}
/*
* This is a helper function for xer_fprint, which directs all the incoming data
* This is a helper function for xer_fprint, which directs all incoming data
* into the provided file descriptor.
*/
static int

View File

@ -5,7 +5,7 @@
#ifndef _XER_ENCODER_H_
#define _XER_ENCODER_H_
#include <constr_TYPE.h>
#include <asn_application.h>
struct asn1_TYPE_descriptor_s; /* Forward declaration */