luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-22 17:08:53 +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

20
glib/gstrfuncs.c
View File

@@ -1073,14 +1073,12 @@ g_strdelimit (gchar *string,
}
gchar*
g_strccpy (gchar *dest,
const gchar *source)
g_strcompress (const gchar *source)
{
const gchar *p = source;
const gchar *p = source, *octal;
gchar *dest = g_malloc (strlen (source) + 1);
gchar *q = dest;
g_return_val_if_fail (dest != NULL, NULL);
while (*p)
{
if (*p == '\\')
@@ -1091,7 +1089,8 @@ g_strccpy (gchar *dest,
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7':
*q = 0;
while ((*p >= '0') && (*p <= '7'))
octal = p;
while ((p < octal + 3) && (*p >= '0') && (*p <= '7'))
{
*q = (*q * 8) + (*p - '0');
p++;
@@ -1128,11 +1127,12 @@ g_strccpy (gchar *dest,
}
gchar *
g_strecpy (gchar *dest,
const gchar *src,
const gchar *exceptions)
g_strescape (const gchar *source,
const gchar *exceptions)
{
const guchar *p = (guchar *) src;
const guchar *p = (guchar *) source;
/* Each source byte needs maximally four destination chars (\777) */
gchar *dest = g_malloc (strlen (source) * 4 + 1);
gchar *q = dest;
guchar excmap[256];