ucx: comparison src/ucx/string.h

-:96f643d30ff1
+:f1b2146d4805
 *
 * @see sstrsubs()
 */
 sstr_t sstrrchr(sstr_t string, int chr);
+const char* ucx_strstr(
+const char *str,
+size_t length,
+const char *match,
+size_t matchlen,
+size_t *newlen);
 /**
 * Returns a substring starting at the location of the first occurrence of the
 * specified string.
 *
 * If the string does not contain the other string, an empty string is returned.
 * @param match  string containing the sequence of characters to match
 * @return       a substring starting at the first occurrence of
 *               <code>match</code>, or an empty string, if the sequence is not
 *               present in <code>string</code>
 */
-sstr_t sstrstr(sstr_t string, sstr_t match);
+sstr_t ucx_sstrstr(sstr_t string, scstr_t match);
+#define sstrstr(string, match) ucx_sstrstr(string, SCSTR(match))
+scstr_t ucx_scstrstr(scstr_t string, scstr_t match);
+#define scstrstr(string, match) ucx_scstrstr(string, SCSTR(match))
 /**
 * Splits a string into parts by using a delimiter string.
 *
 * This function will return <code>NULL</code>, if one of the following happens:
 * @return a sstr_t array containing the split strings or
 *         <code>NULL</code> on error
 *
 * @see sstrsplit_a()
 */
-sstr_t* sstrsplit(sstr_t string, sstr_t delim, ssize_t *count);
+sstr_t* ucx_strsplit(scstr_t string, scstr_t delim, ssize_t *count);
+#define sstrsplit(s, delim, count) ucx_strsplit(SCSTR(s), SCSTR(delim), count)
 /**
 * Performing sstrsplit() using a UcxAllocator.
 *
 * <i>Read the description of sstrsplit() for details.</i>
 * @return a sstr_t array containing the split strings or
 *         <code>NULL</code> on error
 *
 * @see sstrsplit()
 */
-sstr_t* sstrsplit_a(UcxAllocator *allocator, sstr_t string, sstr_t delim,
+sstr_t* ucx_strsplit_a(UcxAllocator *allocator, scstr_t string, scstr_t delim,
 ssize_t *count);
+#define sstrsplit_a(a, s, d, c) ucx_strsplit_a(a, SCSTR(s), SCSTR(d, c))
 /**
 * Compares two UCX strings with standard <code>memcmp()</code>.
 *
 * At first it compares the sstr_t.length attribute of the two strings. The
 * @param s2 the second string
 * @return -1, if the length of s1 is less than the length of s2 or 1, if the
 * length of s1 is greater than the length of s2 or the result of
 * <code>memcmp()</code> otherwise (i.e. 0 if the strings match)
 */
-int sstrcmp(sstr_t s1, sstr_t s2);
+int ucx_str_cmp(scstr_t s1, scstr_t s2);
+#define sstrcmp(s1, s2) ucx_str_cmp(SCSTR(s1), SCSTR(s2))
 /**
 * Compares two UCX strings ignoring the case.
 *
 * At first it compares the sstr_t.length attribute of the two strings. If and
 * @return -1, if the length of s1 is less than the length of s2 or 1, if the
 * length of s1 is greater than the length of s2 or the difference between the
 * first two differing characters otherwise (i.e. 0 if the strings match and
 * no characters differ)
 */
-int sstrcasecmp(sstr_t s1, sstr_t s2);
+int ucx_str_casecmp(scstr_t s1, scstr_t s2);
+#define sstrcasecmp(s1, s2) ucx_str_casecmp(SCSTR(s1), SCSTR(s2))
 /**
 * Creates a duplicate of the specified string.
 *
 * The new sstr_t will contain a copy allocated by standard
 * @see sstrdup()
 */
 sstr_t scstrdup_a(UcxAllocator *allocator, scstr_t string);
 #define sstrdup_a(allocator, s) scstrdup_a(allocator, SCSTR(s))
+size_t ucx_strtrim(const char *str, size_t length, size_t *newlen);
 /**
 * Omits leading and trailing spaces.
 *
 * This function returns a new sstr_t containing a trimmed version of the
 * @param string the string that shall be trimmed
 * @return a new sstr_t containing the trimmed string
 */
 sstr_t sstrtrim(sstr_t string);
+scstr_t scstrtrim(scstr_t string);
 /**
 * Checks, if a string has a specific prefix.
 * @param string the string to check
 * @param prefix the prefix the string should have
 * @return 1, if and only if the string has the specified prefix, 0 otherwise

Mercurial > hg > ucx / file comparison

comparison: src/ucx/string.h

src/ucx/string.h