This commit is contained in:
Lev Walkin 2004-10-21 11:22:12 +00:00
parent f3999547b2
commit 3256d6f62e
6 changed files with 12 additions and 12 deletions

View File

@ -4,7 +4,7 @@
*/
#include <asn_internal.h>
#include <ENUMERATED.h>
#include <ber_codec_prim.h>
#include <asn_codecs_prim.h> /* Encoder and decoder of a primitive type */
/*
* ENUMERATED basic type description.

View File

@ -6,7 +6,7 @@
#define _OBJECT_IDENTIFIER_H_
#include <asn_application.h>
#include <ber_codec_prim.h>
#include <asn_codecs_prim.h>
typedef ASN__PRIMITIVE_TYPE_t OBJECT_IDENTIFIER_t;

View File

@ -6,7 +6,7 @@
#define ASN_TYPE_REAL_H
#include <asn_application.h>
#include <ber_codec_prim.h>
#include <asn_codecs_prim.h>
typedef ASN__PRIMITIVE_TYPE_t REAL_t;

View File

@ -4,7 +4,7 @@
*/
#include <asn_internal.h>
#include <RELATIVE-OID.h>
#include <ber_codec_prim.h> /* Encoder and decoder of a primitive */
#include <asn_codecs_prim.h> /* Encoder and decoder of a primitive type */
#include <limits.h> /* for CHAR_BIT */
#include <assert.h>
#include <errno.h>

View File

@ -161,7 +161,7 @@ xer_check_tag(const void *buf_ptr, int size, const char *need_tag) {
#define XER_GOT_BODY(chunk_buf, chunk_size) do { \
ssize_t converted_size = body_receiver \
(struct_ptr, chunk_buf, chunk_size, \
(struct_key, chunk_buf, chunk_size, \
(size_t)chunk_size < size); \
if(converted_size == -1) RETURN(RC_FAIL); \
chunk_size = converted_size; \
@ -177,13 +177,13 @@ xer_check_tag(const void *buf_ptr, int size, const char *need_tag) {
asn_dec_rval_t
xer_decode_general(asn_codec_ctx_t *opt_codec_ctx,
asn_struct_ctx_t *ctx, /* Type decoder context */
void *struct_ptr, /* The structure must be already allocated */
void *struct_key,
const char *xml_tag, /* Expected XML tag */
void *buf_ptr, size_t size,
int (*opt_unexpected_tag_decoder)
(void *struct_ptr, void *chunk_buf, size_t chunk_size),
(void *struct_key, void *chunk_buf, size_t chunk_size),
ssize_t (*body_receiver)
(void *struct_ptr, void *chunk_buf, size_t chunk_size,
(void *struct_key, void *chunk_buf, size_t chunk_size,
int have_more)
) {
@ -272,7 +272,7 @@ xer_decode_general(asn_codec_ctx_t *opt_codec_ctx,
* Certain tags in the body may be expected.
*/
if(opt_unexpected_tag_decoder
&& opt_unexpected_tag_decoder(struct_ptr,
&& opt_unexpected_tag_decoder(struct_key,
buf_ptr, ch_size) == 0) {
/* Tag's processed fine */
ADVANCE(ch_size);

View File

@ -41,13 +41,13 @@ typedef asn_dec_rval_t (xer_type_decoder_f)(asn_codec_ctx_t *opt_codec_ctx,
*/
asn_dec_rval_t xer_decode_general(asn_codec_ctx_t *opt_codec_ctx,
asn_struct_ctx_t *ctx, /* Type decoder context */
void *struct_ptr, /* The structure must be already allocated */
void *struct_key, /* Treated as opaque pointer */
const char *xml_tag, /* Expected XML tag name */
void *buf_ptr, size_t size,
int (*opt_unexpected_tag_decoder)
(void *struct_ptr, void *chunk_buf, size_t chunk_size),
(void *struct_key, void *chunk_buf, size_t chunk_size),
ssize_t (*body_receiver)
(void *struct_ptr, void *chunk_buf, size_t chunk_size,
(void *struct_key, void *chunk_buf, size_t chunk_size,
int have_more)
);