ucx/string.h

changeset 125
fca8efb122de
parent 123
7fb0f74517c5
child 146
aa376dba1ba8
     1.1 --- a/ucx/string.h	Mon Jul 22 14:51:52 2013 +0200
     1.2 +++ b/ucx/string.h	Tue Jul 23 12:06:28 2013 +0200
     1.3 @@ -232,7 +232,7 @@
     1.4   * exceeded, the last list item will be an empty string.
     1.5   * 
     1.6   * <b>Attention:</b> All list items <b>AND</b> all sstr_t.ptr of the list
     1.7 - * items must be manually passed to <code>free()</code>. Use sstrsplita() with
     1.8 + * items must be manually passed to <code>free()</code>. Use sstrsplit_a() with
     1.9   * an allocator to managed memory, to avoid this.
    1.10   *
    1.11   * @param string the string to split
    1.12 @@ -242,7 +242,7 @@
    1.13   * @return a list of the split strings as sstr_t array or
    1.14   *         <code>NULL</code> on error
    1.15   * 
    1.16 - * @see sstrsplita()
    1.17 + * @see sstrsplit_a()
    1.18   */
    1.19  sstr_t* sstrsplit(sstr_t string, sstr_t delim, size_t *count);
    1.20  
    1.21 @@ -258,18 +258,18 @@
    1.22   * <b>Note:</b> the allocator is not used for memory that is freed within the
    1.23   * same call of this function (locally scoped variables).
    1.24   * 
    1.25 + * @param allocator the UcxAllocator used for allocating memory
    1.26   * @param string the string to split
    1.27   * @param delim  the delimiter string
    1.28   * @param count  IN: the maximum size of the resulting list (0 for an
    1.29   *               unbounded list), OUT: the actual size of the list
    1.30 - * @param allocator the UcxAllocator used for allocating memory
    1.31   * @return a list of the split strings as sstr_t array or
    1.32   *         <code>NULL</code> on error
    1.33   * 
    1.34   * @see sstrsplit()
    1.35   */
    1.36 -sstr_t* sstrsplita(sstr_t string, sstr_t delim, size_t *count,
    1.37 -        UcxAllocator *allocator);
    1.38 +sstr_t* sstrsplit_a(UcxAllocator *allocator, sstr_t string, sstr_t delim,
    1.39 +        size_t *count);
    1.40  
    1.41  /**
    1.42   * Compares two UCX strings with standard <code>memcmp()</code>.
    1.43 @@ -297,7 +297,7 @@
    1.44   * 
    1.45   * @param string the string to duplicate
    1.46   * @return a duplicate of the string
    1.47 - * @see sstrdupa()
    1.48 + * @see sstrdup_a()
    1.49   */
    1.50  sstr_t sstrdup(sstr_t string);
    1.51  
    1.52 @@ -317,7 +317,7 @@
    1.53   * @return a duplicate of the string
    1.54   * @see sstrdup()
    1.55   */
    1.56 -sstr_t sstrdupa(UcxAllocator *allocator, sstr_t string);
    1.57 +sstr_t sstrdup_a(UcxAllocator *allocator, sstr_t string);
    1.58  
    1.59  /**
    1.60   * Omits leading and trailing spaces.

mercurial