Browse Source

saving one malloc as proposed by @jpfr

Stasik0 10 years ago
parent
commit
fa6ddc1e27
2 changed files with 4 additions and 8 deletions
  1. 1 1
      include/ua_types.h
  2. 3 7
      src/ua_types.c

+ 1 - 1
include/ua_types.h

@@ -342,7 +342,7 @@ UA_StatusCode UA_EXPORT UA_String_copyprintf(char const *fmt, UA_String *dst, ..
 UA_Boolean UA_EXPORT UA_String_equal(const UA_String *string1, const UA_String *string2);
 
 /** Compares an UA String with a char array */
-UA_Boolean UA_EXPORT UA_String_equalchars(const UA_String *string1, const char *charString);
+UA_Boolean UA_EXPORT UA_String_equalchars(const UA_String *string1, char *charString);
 
 /* DateTime */
 /** Returns the current time */

+ 3 - 7
src/ua_types.c

@@ -159,13 +159,9 @@ UA_Boolean UA_String_equal(const UA_String *string1, const UA_String *string2) {
     return (is == 0) ? UA_TRUE : UA_FALSE;
 }
 
-UA_Boolean UA_String_equalchars(const UA_String *string1, const char *charString) {
-    UA_String string2 = UA_String_fromChars(charString);
-    UA_Boolean result = UA_FALSE;
-    result = UA_String_equal(string1, &string2);
-    UA_String_deleteMembers(&string2);
-    return result;
-
+UA_Boolean UA_String_equalchars(const UA_String *string1, char *charString) {
+    UA_String string2 = UA_STRING(charString);
+    return UA_String_equal(string1, &string2);
 }
 
 /* DateTime */