luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-02 03:46:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

glib.h gstrfuncs.c Rename g_strccpy to g_strcompress and g_strecpy to

Browse Source 
* glib.h
	* gstrfuncs.c
	* tests/strfunc-test.c: Rename g_strccpy to g_strcompress and
	g_strecpy to g_strescape per Tim Janik's suggestion. Dropped the
	destination parameter, always g_malloc a new string.  Fix bug in
	g_strcompress, octal digits were gobbled up without limit, should
	use max three.

	Sources that use g_strescape must have ifdefs to be compilable
	both with GLib 1.2 and 1.3.
This commit is contained in:
Tor Lillqvist
1999-08-02 23:16:32 +00:00
parent 4877766d0e
commit 1c6c7f7489
16 changed files with 167 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
glib/glib.h
View File

@@ -1500,7 +1500,7 @@ gchar* g_strchomp (gchar *string);
#define g_strstrip( string ) g_strchomp (g_strchug (string))
/* String utility functions that return a newly allocated string which
* ought to be freed from the caller at some point.
* ought to be freed with g_free from the caller at some point.
*/
gchar* g_strdup (const gchar *str);
gchar* g_strdup_printf (const gchar *format,
@@ -1515,21 +1515,23 @@ gchar* g_strconcat (const gchar *string1,
...); /* NULL terminated */
gchar* g_strjoin (const gchar *separator,
...); /* NULL terminated */
/* Copy a string interpreting C string -style escape sequences.
* The recognized sequences are \b \f \n \r \t \\ \" and the octal format.
/* Make a copy of a string interpreting C string -style escape
* sequences. Inverse of g_strescape. The recognized sequences are \b
* \f \n \r \t \\ \" and the octal format.
*/
gchar* g_strccpy (gchar *dest,
const gchar *source);
/* Copy a string escaping nonprintable characters like in C strings.
* Inverse of g_strccpy. The exceptions parameter if non-NULL points
* to a string containing characters that are not escaped.
*/
gchar* g_strecpy (gchar *dest,
const gchar *source,
const gchar *exceptions);
gchar* g_strcompress (const gchar *source);
/* deprecated function (used to be a real function) */
#define g_strescape(src) g_strecpy (g_new (char, strlen (src)*4+1), (src), NULL)
/* Copy a string escaping nonprintable characters like in C strings.
* Inverse of g_strcompress. The exceptions parameter, if non-NULL, points
* to a string containing characters that are not to be escaped.
*/
gchar* g_strescape (const gchar *source,
const gchar *exceptions);
/* Deprecated API:
* gchar* g_strescape (const gchar *source);
* Luckily this function wasn't much used.
* Add a second NULL parameter in calls for mostly identical semantics.
*/
gpointer g_memdup (gconstpointer mem,
guint byte_size);