Changeset e891349 for libcfa/src/collections/string_res.hfa

Timestamp:

Jan 17, 2024, 2:16:04 PM (5 months ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

5bf685f

Parents:

06280ad

Message:

Tweak string assignment-strcpy-strncpy and concatenate-strcat-strncat declarations.

Implement -n- versions correctly.

Refactor to include string_res layer.

Add missing tests.

File:

• libcfa/src/collections/string_res.hfa (modified) (2 diffs)

libcfa/src/collections/string_res.hfa

@@ -88 +88 @@
 }
 
+string_res & assign(string_res & s, const string_res & src, size_t maxlen); // copy specific length from other string
 string_res & assign(string_res & s, const char * buffer, size_t bsize); // copy specific length from buffer
 static inline string_res & ?=?(string_res & s, const char * c) {  // copy from string literal (NULL-terminated)
@@ -129 +130 @@
 
 // Concatenation
+void ?+=?(string_res & s, const string_res & s2);
+void ?+=?(string_res & s, char c);
+void append(string_res & s, const string_res & s2, size_t maxlen);
+void ?+=?(string_res & s, const char * c);
 void append(string_res & s, const char * buffer, size_t bsize);
-void ?+=?(string_res & s, char c); // append a character
-void ?+=?(string_res & s, const string_res & s2); // append-concatenate to first string
-static inline void ?+=?(string_res & s, const char * c) {
-    append( s, c, strlen(c) );
-}
+
+static inline string_res & strcat(string_res & s, const string_res & s2) { s += s2; return s; }
+static inline string_res & strcat(string_res & s, const char * c) { s += c; return s; }
+static inline string_res & strncat(string_res & s, const string_res & s2, size_t maxlen) { append(s, s2, maxlen); return s; }
+static inline string_res & strncat(string_res & s, const char * buffer, size_t bsize) { append(s, buffer, bsize); return s; }
 
 // Repetition