node_data_struct -> asn_data_node_st

diff --git a/lib/element.c b/lib/element.c
index 30cf0ad..ee10478 100644 (file)
--- a/lib/element.c
+++ b/lib/element.c
@@ -974,14 +974,14 @@ asn1_read_tag (asn_node_t root, const char *name, int *tagValue,
 /**
  * asn1_read_node_value:
  * @node: pointer to a node.
- * @data: a point to a node_data_struct
+ * @data: a point to a asn_data_node_st
  *
  * Returns the value a data node inside a asn_node_t structure.
  * The data returned should be handled as constant values.
  *
  * Returns: %ASN1_SUCCESS if the node exists.
  **/
-int asn1_read_node_value (asn_node_t node, ASN1_DATA_NODE* data)
+int asn1_read_node_value (asn_node_t node, asn_data_node_st* data)
 {
   data->name = node->name;
   data->value = node->value;

diff --git a/lib/libtasn1.h b/lib/libtasn1.h
index fc5c6d0..64e4ee0 100644 (file)
--- a/lib/libtasn1.h
+++ b/lib/libtasn1.h
@@ -150,14 +150,14 @@ extern "C"
 #define ASN1_ETYPE_ENUMERATED    21
 #define ASN1_ETYPE_GENERALSTRING 27
 
-  struct node_data_struct
+  struct asn_data_node_st
   {
     const char *name;          /* Node name */
     const void *value;         /* Node value */
     unsigned int value_len;     /* Node value size */
     unsigned int type;         /* Node value type (ASN1_ETYPE_*) */
   };
-  typedef struct node_data_struct ASN1_DATA_NODE;
+  typedef struct asn_data_node_st asn_data_node_st;
 
   /***********************************/
   /*  Fixed constants                */
@@ -208,7 +208,7 @@ extern "C"
                     void *ivalue, int *len);
 
   extern ASN1_API int
-    asn1_read_node_value (asn_node_t node, ASN1_DATA_NODE* data);
+    asn1_read_node_value (asn_node_t node, asn_data_node_st* data);
 
   extern ASN1_API int
     asn1_number_of_elements (asn_node_t element, const char *name, int *num);
@@ -308,6 +308,9 @@ extern "C"
 #define static_struct_asn asn_static_node_st
 #define ASN1_ARRAY_TYPE asn_static_node_t
 
+#define node_data_struct asn_data_node_st
+#define ASN1_DATA_NODE asn_data_node_st
+
 #ifdef __cplusplus
 }
 #endif