From a824bda15b0a2a0e9d91e921ffa1d092f834996c Mon Sep 17 00:00:00 2001
From: skarg <skarg@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Tue, 24 Jan 2006 15:12:13 +0000
Subject: [PATCH] Added new character string function to copy character
 strings.

---
 bacnet-stack/bacstr.c | 20 +++++++++++++++-----
 bacnet-stack/bacstr.h |  7 +++++--
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/bacnet-stack/bacstr.c b/bacnet-stack/bacstr.c
index 81da5481..31df82e3 100644
--- a/bacnet-stack/bacstr.c
+++ b/bacnet-stack/bacstr.c
@@ -225,6 +225,16 @@ bool characterstring_init_ansi(
       value, value?strlen(value):0);
 }
 
+bool characterstring_copy(
+  BACNET_CHARACTER_STRING *dest,
+  BACNET_CHARACTER_STRING *src)
+{
+  return characterstring_init(dest,
+    characterstring_encoding(src),
+    characterstring_value(src),
+    characterstring_length(src));
+}
+
 /* returns false if the string exceeds capacity */
 bool characterstring_append(
   BACNET_CHARACTER_STRING *char_string,
@@ -361,12 +371,12 @@ bool octetstring_init(
 }
 
 bool octetstring_copy(
-  BACNET_OCTET_STRING *octet_string_dest,
-  BACNET_OCTET_STRING *octet_string_src)
+  BACNET_OCTET_STRING *dest,
+  BACNET_OCTET_STRING *src)
 {
-  return octetstring_init(octet_string_dest,
-    octetstring_value(octet_string_src),
-    octetstring_length(octet_string_src));
+  return octetstring_init(dest,
+    octetstring_value(src),
+    octetstring_length(src));
 }
 
 /* returns false if the string exceeds capacity */
diff --git a/bacnet-stack/bacstr.h b/bacnet-stack/bacstr.h
index 0bb2ae37..dd9942db 100644
--- a/bacnet-stack/bacstr.h
+++ b/bacnet-stack/bacstr.h
@@ -99,6 +99,9 @@ bool characterstring_init(
 bool characterstring_init_ansi(
     BACNET_CHARACTER_STRING *char_string,
     char *value);
+bool characterstring_copy(
+  BACNET_CHARACTER_STRING *dest,
+  BACNET_CHARACTER_STRING *src);
 /* returns false if the string exceeds capacity */
 bool characterstring_append(
   BACNET_CHARACTER_STRING *char_string,
@@ -127,8 +130,8 @@ bool octetstring_init(
   uint8_t *value,
   size_t length);
 bool octetstring_copy(
-  BACNET_OCTET_STRING *octet_string_dest,
-  BACNET_OCTET_STRING *octet_string_src);
+  BACNET_OCTET_STRING *dest,
+  BACNET_OCTET_STRING *src);
 /* returns false if the string exceeds capacity */
 bool octetstring_append(
     BACNET_OCTET_STRING *octet_string,