diff options
| author | Tim Janik <timj@gtk.org> | 1998-10-25 06:44:49 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 1998-10-25 06:44:49 +0000 |
| commit | e86746f168529218742af51365155a5034c8f9c8 (patch) | |
| tree | 61db6ccf71d4c23a968e717f4ec27d406014d3b2 /gstrfuncs.c | |
| parent | 36ab1965234ce32f170de5157398c47f1f2ac4ec (diff) | |
| download | glib-e86746f168529218742af51365155a5034c8f9c8.tar.gz | |
no more characters are available if read() returns anything less than 1,
Sun Oct 25 07:30:10 1998 Tim Janik <timj@gtk.org>
* gscanner.c:
(g_scanner_peek_next_char):
(g_scanner_get_char): no more characters are available if read() returns
anything less than 1, not only on 0 return.
* glib.h:
* gstrfuncs.c: final API cleanup of string arrays to suit sopwith's
argument order requirements.
(g_strsplit): renamed from g_str_array_split().
(g_strjoinv): renamed from g_str_array_joinv(), string array is
now passed as last parameter. removed `const' qualifier from string
array pointer (again).
(g_strjoin): new function from sopwith to concatenate strings with
an additional seperator.
(g_strfreev): renamed from g_str_array_free.
Diffstat (limited to 'gstrfuncs.c')
| -rw-r--r-- | gstrfuncs.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gstrfuncs.c b/gstrfuncs.c index 776e99120..5b58c5446 100644 --- a/gstrfuncs.c +++ b/gstrfuncs.c @@ -1021,9 +1021,9 @@ g_strchomp (gchar *string) } gchar** -g_str_array_split (const gchar *string, - const gchar *delimiter, - gint max_tokens) +g_strsplit (const gchar *string, + const gchar *delimiter, + gint max_tokens) { GSList *string_list = NULL, *slist; gchar **str_array, *s; @@ -1076,7 +1076,7 @@ g_str_array_split (const gchar *string, } void -g_str_array_free (gchar **str_array) +g_strfreev (gchar **str_array) { if (str_array) { @@ -1090,8 +1090,8 @@ g_str_array_free (gchar **str_array) } gchar* -g_str_array_joinv (const gchar *separator, - const gchar **str_array) +g_strjoinv (const gchar *separator, + gchar **str_array) { gchar *string; @@ -1126,8 +1126,8 @@ g_str_array_joinv (const gchar *separator, } gchar* -g_str_array_join (const gchar *separator, - ...) +g_strjoin (const gchar *separator, + ...) { gchar *string, *s; va_list args; |