From 3256d6f62e594aa254d6094a8df15bebb526aab4 Mon Sep 17 00:00:00 2001
From: Lev Walkin <vlm@lionet.info>
Date: Thu, 21 Oct 2004 11:22:12 +0000
Subject: [PATCH] renaming
---
skeletons/ENUMERATED.c | 2 +-
skeletons/OBJECT_IDENTIFIER.h | 2 +-
skeletons/REAL.h | 2 +-
skeletons/RELATIVE-OID.c | 2 +-
skeletons/xer_decoder.c | 10 +++++-----
skeletons/xer_decoder.h | 6 +++---
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/skeletons/ENUMERATED.c b/skeletons/ENUMERATED.c
index 83a71d07..3d07c010 100644
--- a/skeletons/ENUMERATED.c
+++ b/skeletons/ENUMERATED.c
@@ -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.
diff --git a/skeletons/OBJECT_IDENTIFIER.h b/skeletons/OBJECT_IDENTIFIER.h
index 8945a32d..668bd495 100644
--- a/skeletons/OBJECT_IDENTIFIER.h
+++ b/skeletons/OBJECT_IDENTIFIER.h
@@ -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;
diff --git a/skeletons/REAL.h b/skeletons/REAL.h
index bd597994..86ae40f0 100644
--- a/skeletons/REAL.h
+++ b/skeletons/REAL.h
@@ -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;
diff --git a/skeletons/RELATIVE-OID.c b/skeletons/RELATIVE-OID.c
index eba1eaa4..13fa0e2b 100644
--- a/skeletons/RELATIVE-OID.c
+++ b/skeletons/RELATIVE-OID.c
@@ -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>
diff --git a/skeletons/xer_decoder.c b/skeletons/xer_decoder.c
index 96f72e9c..9cbccf81 100644
--- a/skeletons/xer_decoder.c
+++ b/skeletons/xer_decoder.c
@@ -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);
diff --git a/skeletons/xer_decoder.h b/skeletons/xer_decoder.h
index e258b5b8..b8aef662 100644
--- a/skeletons/xer_decoder.h
+++ b/skeletons/xer_decoder.h
@@ -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)
);
--
GitLab