renamed asn1_copy_node2 to asn1_dup_node

diff --git a/NEWS b/NEWS
index 7d2ce95..d62c429 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,7 @@ GNU Libtasn1 NEWS                                     -*- outline -*-
 - asn1_der_decoding_element() is an alias to asn1_der_decoding().
 - optimized asn1_der_decoding_startEnd(). It only performs the decoding
   step, if it is not already done.
-- Added asn1_copy_node2().
+- Added asn1_dup_node().
 - asn1_read_value() understands the ?CURRENT keyword, which can be used
   to indicate the current element of a sequence, when the provided node
   is a sequence element.

diff --git a/lib/libtasn1.h b/lib/libtasn1.h
index 064c10f..f798a75 100644 (file)
--- a/lib/libtasn1.h
+++ b/lib/libtasn1.h
@@ -330,7 +330,7 @@ extern "C"
     asn1_copy_node (asn1_node dst, const char *dst_name,
                    asn1_node src, const char *src_name);
   extern ASN1_API asn1_node
-    asn1_copy_node2 (asn1_node src, const char *src_name);
+    asn1_dup_node (asn1_node src, const char *src_name);
 
   /* Internal and low-level DER utility functions. */
 

diff --git a/lib/structure.c b/lib/structure.c
index 1c9dd59..acd2f2e 100644 (file)
--- a/lib/structure.c
+++ b/lib/structure.c
@@ -1177,7 +1177,7 @@ asn1_copy_node (asn1_node dst, const char *dst_name,
 }
 
 /**
- * asn1_copy_node2:
+ * asn1_dup_node:
  * @src: Source asn1 node.
  * @src_name: Field name in source node.
  *
@@ -1187,7 +1187,7 @@ asn1_copy_node (asn1_node dst, const char *dst_name,
  * Returns: Return %NULL on failure.
  **/
 asn1_node
-asn1_copy_node2 (asn1_node src, const char *src_name)
+asn1_dup_node (asn1_node src, const char *src_name)
 {
   return _asn1_copy_structure2(src, src_name);
 }

diff --git a/tests/copynode.c b/tests/copynode.c
index 5e5821f..a24f1ce 100644 (file)
--- a/tests/copynode.c
+++ b/tests/copynode.c
@@ -152,11 +152,11 @@ main (int argc, char *argv[])
 
   asn1_delete_structure (&cpy_node);
 
-  /* Test asn1_copy_node2 */
-  cpy_node = asn1_copy_node2(asn1_element, "");
+  /* Test asn1_dup_node */
+  cpy_node = asn1_dup_node(asn1_element, "");
   if (cpy_node == NULL)
     {
-      printf ("Cannot copy node (copy_node2)\n");
+      printf ("Cannot copy node (dup_node)\n");
       exit (1);
     }