1998-06-11 01:21:14 +02:00
|
|
|
/* GLIB - Library of useful routines for C programming
|
|
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Library General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Library General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Library General Public
|
|
|
|
* License along with this library; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
1998-12-15 06:28:02 +01:00
|
|
|
|
1999-02-24 07:14:27 +01:00
|
|
|
/*
|
|
|
|
* Modified by the GLib Team and others 1997-1999. See the AUTHORS
|
|
|
|
* file for a list of people on the GLib Team. See the ChangeLog
|
|
|
|
* files for a list of changes. These files are distributed with
|
|
|
|
* GLib at ftp://ftp.gtk.org/pub/gtk/.
|
|
|
|
*/
|
|
|
|
|
1998-12-15 06:28:02 +01:00
|
|
|
/*
|
|
|
|
* MT safe
|
|
|
|
*/
|
|
|
|
|
1999-04-17 22:04:49 +02:00
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include <config.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
#include <unistd.h>
|
|
|
|
#endif
|
1998-06-11 01:21:14 +02:00
|
|
|
#include <stdarg.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <ctype.h>
|
1998-06-12 11:38:32 +02:00
|
|
|
#include "glib.h"
|
1998-06-11 01:21:14 +02:00
|
|
|
|
|
|
|
typedef struct _GRealStringChunk GRealStringChunk;
|
|
|
|
typedef struct _GRealString GRealString;
|
|
|
|
|
|
|
|
struct _GRealStringChunk
|
|
|
|
{
|
|
|
|
GHashTable *const_table;
|
|
|
|
GSList *storage_list;
|
|
|
|
gint storage_next;
|
|
|
|
gint this_size;
|
|
|
|
gint default_size;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct _GRealString
|
|
|
|
{
|
|
|
|
gchar *str;
|
|
|
|
gint len;
|
|
|
|
gint alloc;
|
|
|
|
};
|
|
|
|
|
1999-02-10 10:40:46 +01:00
|
|
|
G_LOCK_DEFINE_STATIC (string_mem_chunk);
|
1998-06-11 01:21:14 +02:00
|
|
|
static GMemChunk *string_mem_chunk = NULL;
|
|
|
|
|
|
|
|
/* Hash Functions.
|
|
|
|
*/
|
|
|
|
|
|
|
|
gint
|
|
|
|
g_str_equal (gconstpointer v, gconstpointer v2)
|
|
|
|
{
|
|
|
|
return strcmp ((const gchar*) v, (const gchar*)v2) == 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* a char* hash function from ASU */
|
|
|
|
guint
|
|
|
|
g_str_hash (gconstpointer v)
|
|
|
|
{
|
|
|
|
const char *s = (char*)v;
|
|
|
|
const char *p;
|
|
|
|
guint h=0, g;
|
|
|
|
|
|
|
|
for(p = s; *p != '\0'; p += 1) {
|
|
|
|
h = ( h << 4 ) + *p;
|
|
|
|
if ( ( g = h & 0xf0000000 ) ) {
|
|
|
|
h = h ^ (g >> 24);
|
|
|
|
h = h ^ g;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return h /* % M */;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* String Chunks.
|
|
|
|
*/
|
|
|
|
|
|
|
|
GStringChunk*
|
|
|
|
g_string_chunk_new (gint default_size)
|
|
|
|
{
|
|
|
|
GRealStringChunk *new_chunk = g_new (GRealStringChunk, 1);
|
|
|
|
gint size = 1;
|
|
|
|
|
|
|
|
while (size < default_size)
|
|
|
|
size <<= 1;
|
|
|
|
|
|
|
|
new_chunk->const_table = NULL;
|
|
|
|
new_chunk->storage_list = NULL;
|
|
|
|
new_chunk->storage_next = size;
|
|
|
|
new_chunk->default_size = size;
|
|
|
|
new_chunk->this_size = size;
|
|
|
|
|
|
|
|
return (GStringChunk*) new_chunk;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
g_string_chunk_free (GStringChunk *fchunk)
|
|
|
|
{
|
|
|
|
GRealStringChunk *chunk = (GRealStringChunk*) fchunk;
|
|
|
|
GSList *tmp_list;
|
|
|
|
|
|
|
|
g_return_if_fail (chunk != NULL);
|
|
|
|
|
|
|
|
if (chunk->storage_list)
|
|
|
|
{
|
|
|
|
for (tmp_list = chunk->storage_list; tmp_list; tmp_list = tmp_list->next)
|
|
|
|
g_free (tmp_list->data);
|
|
|
|
|
|
|
|
g_slist_free (chunk->storage_list);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (chunk->const_table)
|
|
|
|
g_hash_table_destroy (chunk->const_table);
|
|
|
|
|
|
|
|
g_free (chunk);
|
|
|
|
}
|
|
|
|
|
|
|
|
gchar*
|
|
|
|
g_string_chunk_insert (GStringChunk *fchunk,
|
|
|
|
const gchar *string)
|
|
|
|
{
|
|
|
|
GRealStringChunk *chunk = (GRealStringChunk*) fchunk;
|
|
|
|
gint len = strlen (string);
|
|
|
|
char* pos;
|
|
|
|
|
|
|
|
g_return_val_if_fail (chunk != NULL, NULL);
|
|
|
|
|
|
|
|
if ((chunk->storage_next + len + 1) > chunk->this_size)
|
|
|
|
{
|
|
|
|
gint new_size = chunk->default_size;
|
|
|
|
|
|
|
|
while (new_size < len+1)
|
|
|
|
new_size <<= 1;
|
|
|
|
|
|
|
|
chunk->storage_list = g_slist_prepend (chunk->storage_list,
|
|
|
|
g_new (char, new_size));
|
|
|
|
|
|
|
|
chunk->this_size = new_size;
|
|
|
|
chunk->storage_next = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
pos = ((char*)chunk->storage_list->data) + chunk->storage_next;
|
|
|
|
|
|
|
|
strcpy (pos, string);
|
|
|
|
|
|
|
|
chunk->storage_next += len + 1;
|
|
|
|
|
|
|
|
return pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
gchar*
|
|
|
|
g_string_chunk_insert_const (GStringChunk *fchunk,
|
|
|
|
const gchar *string)
|
|
|
|
{
|
|
|
|
GRealStringChunk *chunk = (GRealStringChunk*) fchunk;
|
|
|
|
char* lookup;
|
|
|
|
|
|
|
|
g_return_val_if_fail (chunk != NULL, NULL);
|
|
|
|
|
|
|
|
if (!chunk->const_table)
|
|
|
|
chunk->const_table = g_hash_table_new (g_str_hash, g_str_equal);
|
|
|
|
|
|
|
|
lookup = (char*) g_hash_table_lookup (chunk->const_table, (gchar *)string);
|
|
|
|
|
|
|
|
if (!lookup)
|
|
|
|
{
|
|
|
|
lookup = g_string_chunk_insert (fchunk, string);
|
|
|
|
g_hash_table_insert (chunk->const_table, lookup, lookup);
|
|
|
|
}
|
|
|
|
|
|
|
|
return lookup;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Strings.
|
|
|
|
*/
|
1999-07-24 20:50:58 +02:00
|
|
|
static inline gint
|
1999-04-17 22:04:49 +02:00
|
|
|
nearest_power (gint num)
|
1998-06-11 01:21:14 +02:00
|
|
|
{
|
|
|
|
gint n = 1;
|
|
|
|
|
|
|
|
while (n < num)
|
|
|
|
n <<= 1;
|
|
|
|
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
g_string_maybe_expand (GRealString* string, gint len)
|
|
|
|
{
|
|
|
|
if (string->len + len >= string->alloc)
|
|
|
|
{
|
1999-04-17 22:04:49 +02:00
|
|
|
string->alloc = nearest_power (string->len + len + 1);
|
1998-06-11 01:21:14 +02:00
|
|
|
string->str = g_realloc (string->str, string->alloc);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
GString*
|
|
|
|
g_string_sized_new (guint dfl_size)
|
|
|
|
{
|
|
|
|
GRealString *string;
|
|
|
|
|
1998-12-16 06:38:35 +01:00
|
|
|
G_LOCK (string_mem_chunk);
|
1998-06-11 01:21:14 +02:00
|
|
|
if (!string_mem_chunk)
|
|
|
|
string_mem_chunk = g_mem_chunk_new ("string mem chunk",
|
|
|
|
sizeof (GRealString),
|
|
|
|
1024, G_ALLOC_AND_FREE);
|
|
|
|
|
|
|
|
string = g_chunk_new (GRealString, string_mem_chunk);
|
1998-12-16 06:38:35 +01:00
|
|
|
G_UNLOCK (string_mem_chunk);
|
1998-06-11 01:21:14 +02:00
|
|
|
|
|
|
|
string->alloc = 0;
|
|
|
|
string->len = 0;
|
|
|
|
string->str = NULL;
|
|
|
|
|
|
|
|
g_string_maybe_expand (string, MAX (dfl_size, 2));
|
|
|
|
string->str[0] = 0;
|
|
|
|
|
|
|
|
return (GString*) string;
|
|
|
|
}
|
|
|
|
|
|
|
|
GString*
|
|
|
|
g_string_new (const gchar *init)
|
|
|
|
{
|
|
|
|
GString *string;
|
|
|
|
|
|
|
|
string = g_string_sized_new (2);
|
|
|
|
|
|
|
|
if (init)
|
|
|
|
g_string_append (string, init);
|
|
|
|
|
|
|
|
return string;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
g_string_free (GString *string,
|
|
|
|
gint free_segment)
|
|
|
|
{
|
|
|
|
g_return_if_fail (string != NULL);
|
|
|
|
|
|
|
|
if (free_segment)
|
|
|
|
g_free (string->str);
|
|
|
|
|
1998-12-16 06:38:35 +01:00
|
|
|
G_LOCK (string_mem_chunk);
|
1998-06-11 01:21:14 +02:00
|
|
|
g_mem_chunk_free (string_mem_chunk, string);
|
1998-12-16 06:38:35 +01:00
|
|
|
G_UNLOCK (string_mem_chunk);
|
1998-06-11 01:21:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
GString*
|
|
|
|
g_string_assign (GString *lval,
|
|
|
|
const gchar *rval)
|
|
|
|
{
|
|
|
|
g_string_truncate (lval, 0);
|
|
|
|
g_string_append (lval, rval);
|
|
|
|
|
|
|
|
return lval;
|
|
|
|
}
|
|
|
|
|
|
|
|
GString*
|
|
|
|
g_string_truncate (GString* fstring,
|
|
|
|
gint len)
|
|
|
|
{
|
|
|
|
GRealString *string = (GRealString*)fstring;
|
|
|
|
|
|
|
|
g_return_val_if_fail (string != NULL, NULL);
|
|
|
|
|
|
|
|
string->len = len;
|
|
|
|
|
|
|
|
string->str[len] = 0;
|
|
|
|
|
|
|
|
return fstring;
|
|
|
|
}
|
|
|
|
|
|
|
|
GString*
|
|
|
|
g_string_append (GString *fstring,
|
|
|
|
const gchar *val)
|
|
|
|
{
|
|
|
|
GRealString *string = (GRealString*)fstring;
|
|
|
|
int len;
|
|
|
|
|
|
|
|
g_return_val_if_fail (string != NULL, NULL);
|
|
|
|
g_return_val_if_fail (val != NULL, fstring);
|
|
|
|
|
|
|
|
len = strlen (val);
|
|
|
|
g_string_maybe_expand (string, len);
|
|
|
|
|
|
|
|
strcpy (string->str + string->len, val);
|
|
|
|
|
|
|
|
string->len += len;
|
|
|
|
|
|
|
|
return fstring;
|
|
|
|
}
|
|
|
|
|
|
|
|
GString*
|
|
|
|
g_string_append_c (GString *fstring,
|
|
|
|
gchar c)
|
|
|
|
{
|
|
|
|
GRealString *string = (GRealString*)fstring;
|
|
|
|
|
|
|
|
g_return_val_if_fail (string != NULL, NULL);
|
|
|
|
g_string_maybe_expand (string, 1);
|
|
|
|
|
|
|
|
string->str[string->len++] = c;
|
|
|
|
string->str[string->len] = 0;
|
|
|
|
|
|
|
|
return fstring;
|
|
|
|
}
|
|
|
|
|
|
|
|
GString*
|
|
|
|
g_string_prepend (GString *fstring,
|
|
|
|
const gchar *val)
|
|
|
|
{
|
|
|
|
GRealString *string = (GRealString*)fstring;
|
|
|
|
gint len;
|
|
|
|
|
|
|
|
g_return_val_if_fail (string != NULL, NULL);
|
|
|
|
g_return_val_if_fail (val != NULL, fstring);
|
|
|
|
|
|
|
|
len = strlen (val);
|
|
|
|
g_string_maybe_expand (string, len);
|
|
|
|
|
|
|
|
g_memmove (string->str + len, string->str, string->len);
|
|
|
|
|
|
|
|
strncpy (string->str, val, len);
|
|
|
|
|
|
|
|
string->len += len;
|
|
|
|
|
|
|
|
string->str[string->len] = 0;
|
|
|
|
|
|
|
|
return fstring;
|
|
|
|
}
|
|
|
|
|
|
|
|
GString*
|
|
|
|
g_string_prepend_c (GString *fstring,
|
|
|
|
gchar c)
|
|
|
|
{
|
|
|
|
GRealString *string = (GRealString*)fstring;
|
|
|
|
|
|
|
|
g_return_val_if_fail (string != NULL, NULL);
|
|
|
|
g_string_maybe_expand (string, 1);
|
|
|
|
|
|
|
|
g_memmove (string->str + 1, string->str, string->len);
|
|
|
|
|
|
|
|
string->str[0] = c;
|
|
|
|
|
|
|
|
string->len += 1;
|
|
|
|
|
|
|
|
string->str[string->len] = 0;
|
|
|
|
|
|
|
|
return fstring;
|
|
|
|
}
|
|
|
|
|
|
|
|
GString*
|
|
|
|
g_string_insert (GString *fstring,
|
|
|
|
gint pos,
|
|
|
|
const gchar *val)
|
|
|
|
{
|
|
|
|
GRealString *string = (GRealString*)fstring;
|
|
|
|
gint len;
|
|
|
|
|
|
|
|
g_return_val_if_fail (string != NULL, NULL);
|
|
|
|
g_return_val_if_fail (val != NULL, fstring);
|
|
|
|
g_return_val_if_fail (pos >= 0, fstring);
|
|
|
|
g_return_val_if_fail (pos <= string->len, fstring);
|
|
|
|
|
|
|
|
len = strlen (val);
|
|
|
|
g_string_maybe_expand (string, len);
|
|
|
|
|
|
|
|
g_memmove (string->str + pos + len, string->str + pos, string->len - pos);
|
|
|
|
|
|
|
|
strncpy (string->str + pos, val, len);
|
|
|
|
|
|
|
|
string->len += len;
|
|
|
|
|
|
|
|
string->str[string->len] = 0;
|
|
|
|
|
|
|
|
return fstring;
|
|
|
|
}
|
|
|
|
|
|
|
|
GString *
|
|
|
|
g_string_insert_c (GString *fstring,
|
|
|
|
gint pos,
|
|
|
|
gchar c)
|
|
|
|
{
|
|
|
|
GRealString *string = (GRealString*)fstring;
|
|
|
|
|
|
|
|
g_return_val_if_fail (string != NULL, NULL);
|
|
|
|
g_return_val_if_fail (pos <= string->len, fstring);
|
|
|
|
|
|
|
|
g_string_maybe_expand (string, 1);
|
|
|
|
|
|
|
|
g_memmove (string->str + pos + 1, string->str + pos, string->len - pos);
|
|
|
|
|
|
|
|
string->str[pos] = c;
|
|
|
|
|
|
|
|
string->len += 1;
|
|
|
|
|
|
|
|
string->str[string->len] = 0;
|
|
|
|
|
|
|
|
return fstring;
|
|
|
|
}
|
|
|
|
|
|
|
|
GString*
|
|
|
|
g_string_erase (GString *fstring,
|
|
|
|
gint pos,
|
|
|
|
gint len)
|
|
|
|
{
|
|
|
|
GRealString *string = (GRealString*)fstring;
|
|
|
|
|
|
|
|
g_return_val_if_fail (string != NULL, NULL);
|
|
|
|
g_return_val_if_fail (len >= 0, fstring);
|
|
|
|
g_return_val_if_fail (pos >= 0, fstring);
|
|
|
|
g_return_val_if_fail (pos <= string->len, fstring);
|
|
|
|
g_return_val_if_fail (pos + len <= string->len, fstring);
|
|
|
|
|
|
|
|
if (pos + len < string->len)
|
|
|
|
g_memmove (string->str + pos, string->str + pos + len, string->len - (pos + len));
|
|
|
|
|
|
|
|
string->len -= len;
|
|
|
|
|
|
|
|
string->str[string->len] = 0;
|
|
|
|
|
|
|
|
return fstring;
|
|
|
|
}
|
|
|
|
|
|
|
|
GString*
|
|
|
|
g_string_down (GString *fstring)
|
|
|
|
{
|
|
|
|
GRealString *string = (GRealString*)fstring;
|
1999-07-24 20:50:58 +02:00
|
|
|
guchar *s;
|
1998-06-11 01:21:14 +02:00
|
|
|
|
|
|
|
g_return_val_if_fail (string != NULL, NULL);
|
|
|
|
|
|
|
|
s = string->str;
|
|
|
|
|
|
|
|
while (*s)
|
|
|
|
{
|
|
|
|
*s = tolower (*s);
|
|
|
|
s++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return fstring;
|
|
|
|
}
|
|
|
|
|
|
|
|
GString*
|
|
|
|
g_string_up (GString *fstring)
|
|
|
|
{
|
|
|
|
GRealString *string = (GRealString*)fstring;
|
1999-07-24 20:50:58 +02:00
|
|
|
guchar *s;
|
1998-06-11 01:21:14 +02:00
|
|
|
|
|
|
|
g_return_val_if_fail (string != NULL, NULL);
|
|
|
|
|
|
|
|
s = string->str;
|
|
|
|
|
|
|
|
while (*s)
|
|
|
|
{
|
|
|
|
*s = toupper (*s);
|
|
|
|
s++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return fstring;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
removed this function which was not publically exported in glib.h. to
Mon Aug 24 02:08:56 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gstring.c:
* gstrfuncs.c:
(g_vsprintf): removed this function which was not publically
exported in glib.h. to export it, it should have been named
differently in the first place, since its semantics differ from
vsprintf(). apart from that, it was a possible cause for
problems since it worked on a previously allocated memory area and
was used in a lot places of glib. exporting it would have been a
guararant for problems with threaded programs.
(g_printf_string_upper_bound): exported this function to return
a string size, guarranteed to be big enough to hold the fully
expanded format+args string. added 'q', 'L' and 'll' flag handling.
in fact, the newly allocated area is in most cases much bigger than
required.
(g_strdup_vprintf()): new function returning a newly allocated string
containing the contents of *format and associated args (size is
calculated with g_printf_string_upper_bound()).
(g_strdup_printf): new function which wraps g_strdup_vprintf().
* configure.in: check for va_copy() or __va_copy() alternatively.
check whether va_lists can be copyied by value.
* glib.h: provide a definition for G_VA_COPY.
* glib.h:
* gmessages.c:
(g_logv):
(g_vsnprintf):
pass va_lists by value, not by reference, since this causes problems
on platforms that implement va_list as as arrays. internaly, use
G_VA_COPY (new_arg, org_arg); va_end (new_arg); to produce a second
va_list variable, if multiple passes are required. changed all
callers.
* glib.h:
* gerror.h:
renamed g_debug() to g_on_error_query(), cleaned up a bit.
renamed g_stack_trace() to g_on_error_stack_trace() since both
functions cluttered different namespaces.
there is an appropriate comment in glib.h now that explains the
unix and gdb specific dependencies of both functions.
removed g_attach_process().
g_on_error_stack_trace() should probably be handled with caution,
i've seem several different linux versions (2.0.x) become unstable
after invokation of this function.
1998-08-24 07:26:53 +02:00
|
|
|
g_string_sprintfa_int (GString *string,
|
1998-06-11 01:21:14 +02:00
|
|
|
const gchar *fmt,
|
removed this function which was not publically exported in glib.h. to
Mon Aug 24 02:08:56 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gstring.c:
* gstrfuncs.c:
(g_vsprintf): removed this function which was not publically
exported in glib.h. to export it, it should have been named
differently in the first place, since its semantics differ from
vsprintf(). apart from that, it was a possible cause for
problems since it worked on a previously allocated memory area and
was used in a lot places of glib. exporting it would have been a
guararant for problems with threaded programs.
(g_printf_string_upper_bound): exported this function to return
a string size, guarranteed to be big enough to hold the fully
expanded format+args string. added 'q', 'L' and 'll' flag handling.
in fact, the newly allocated area is in most cases much bigger than
required.
(g_strdup_vprintf()): new function returning a newly allocated string
containing the contents of *format and associated args (size is
calculated with g_printf_string_upper_bound()).
(g_strdup_printf): new function which wraps g_strdup_vprintf().
* configure.in: check for va_copy() or __va_copy() alternatively.
check whether va_lists can be copyied by value.
* glib.h: provide a definition for G_VA_COPY.
* glib.h:
* gmessages.c:
(g_logv):
(g_vsnprintf):
pass va_lists by value, not by reference, since this causes problems
on platforms that implement va_list as as arrays. internaly, use
G_VA_COPY (new_arg, org_arg); va_end (new_arg); to produce a second
va_list variable, if multiple passes are required. changed all
callers.
* glib.h:
* gerror.h:
renamed g_debug() to g_on_error_query(), cleaned up a bit.
renamed g_stack_trace() to g_on_error_stack_trace() since both
functions cluttered different namespaces.
there is an appropriate comment in glib.h now that explains the
unix and gdb specific dependencies of both functions.
removed g_attach_process().
g_on_error_stack_trace() should probably be handled with caution,
i've seem several different linux versions (2.0.x) become unstable
after invokation of this function.
1998-08-24 07:26:53 +02:00
|
|
|
va_list args)
|
1998-06-11 01:21:14 +02:00
|
|
|
{
|
removed this function which was not publically exported in glib.h. to
Mon Aug 24 02:08:56 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gstring.c:
* gstrfuncs.c:
(g_vsprintf): removed this function which was not publically
exported in glib.h. to export it, it should have been named
differently in the first place, since its semantics differ from
vsprintf(). apart from that, it was a possible cause for
problems since it worked on a previously allocated memory area and
was used in a lot places of glib. exporting it would have been a
guararant for problems with threaded programs.
(g_printf_string_upper_bound): exported this function to return
a string size, guarranteed to be big enough to hold the fully
expanded format+args string. added 'q', 'L' and 'll' flag handling.
in fact, the newly allocated area is in most cases much bigger than
required.
(g_strdup_vprintf()): new function returning a newly allocated string
containing the contents of *format and associated args (size is
calculated with g_printf_string_upper_bound()).
(g_strdup_printf): new function which wraps g_strdup_vprintf().
* configure.in: check for va_copy() or __va_copy() alternatively.
check whether va_lists can be copyied by value.
* glib.h: provide a definition for G_VA_COPY.
* glib.h:
* gmessages.c:
(g_logv):
(g_vsnprintf):
pass va_lists by value, not by reference, since this causes problems
on platforms that implement va_list as as arrays. internaly, use
G_VA_COPY (new_arg, org_arg); va_end (new_arg); to produce a second
va_list variable, if multiple passes are required. changed all
callers.
* glib.h:
* gerror.h:
renamed g_debug() to g_on_error_query(), cleaned up a bit.
renamed g_stack_trace() to g_on_error_stack_trace() since both
functions cluttered different namespaces.
there is an appropriate comment in glib.h now that explains the
unix and gdb specific dependencies of both functions.
removed g_attach_process().
g_on_error_stack_trace() should probably be handled with caution,
i've seem several different linux versions (2.0.x) become unstable
after invokation of this function.
1998-08-24 07:26:53 +02:00
|
|
|
gchar *buffer;
|
|
|
|
|
|
|
|
buffer = g_strdup_vprintf (fmt, args);
|
|
|
|
g_string_append (string, buffer);
|
|
|
|
g_free (buffer);
|
1998-06-11 01:21:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
g_string_sprintf (GString *string,
|
|
|
|
const gchar *fmt,
|
|
|
|
...)
|
|
|
|
{
|
removed this function which was not publically exported in glib.h. to
Mon Aug 24 02:08:56 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gstring.c:
* gstrfuncs.c:
(g_vsprintf): removed this function which was not publically
exported in glib.h. to export it, it should have been named
differently in the first place, since its semantics differ from
vsprintf(). apart from that, it was a possible cause for
problems since it worked on a previously allocated memory area and
was used in a lot places of glib. exporting it would have been a
guararant for problems with threaded programs.
(g_printf_string_upper_bound): exported this function to return
a string size, guarranteed to be big enough to hold the fully
expanded format+args string. added 'q', 'L' and 'll' flag handling.
in fact, the newly allocated area is in most cases much bigger than
required.
(g_strdup_vprintf()): new function returning a newly allocated string
containing the contents of *format and associated args (size is
calculated with g_printf_string_upper_bound()).
(g_strdup_printf): new function which wraps g_strdup_vprintf().
* configure.in: check for va_copy() or __va_copy() alternatively.
check whether va_lists can be copyied by value.
* glib.h: provide a definition for G_VA_COPY.
* glib.h:
* gmessages.c:
(g_logv):
(g_vsnprintf):
pass va_lists by value, not by reference, since this causes problems
on platforms that implement va_list as as arrays. internaly, use
G_VA_COPY (new_arg, org_arg); va_end (new_arg); to produce a second
va_list variable, if multiple passes are required. changed all
callers.
* glib.h:
* gerror.h:
renamed g_debug() to g_on_error_query(), cleaned up a bit.
renamed g_stack_trace() to g_on_error_stack_trace() since both
functions cluttered different namespaces.
there is an appropriate comment in glib.h now that explains the
unix and gdb specific dependencies of both functions.
removed g_attach_process().
g_on_error_stack_trace() should probably be handled with caution,
i've seem several different linux versions (2.0.x) become unstable
after invokation of this function.
1998-08-24 07:26:53 +02:00
|
|
|
va_list args;
|
1998-06-11 01:21:14 +02:00
|
|
|
|
|
|
|
g_string_truncate (string, 0);
|
|
|
|
|
removed this function which was not publically exported in glib.h. to
Mon Aug 24 02:08:56 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gstring.c:
* gstrfuncs.c:
(g_vsprintf): removed this function which was not publically
exported in glib.h. to export it, it should have been named
differently in the first place, since its semantics differ from
vsprintf(). apart from that, it was a possible cause for
problems since it worked on a previously allocated memory area and
was used in a lot places of glib. exporting it would have been a
guararant for problems with threaded programs.
(g_printf_string_upper_bound): exported this function to return
a string size, guarranteed to be big enough to hold the fully
expanded format+args string. added 'q', 'L' and 'll' flag handling.
in fact, the newly allocated area is in most cases much bigger than
required.
(g_strdup_vprintf()): new function returning a newly allocated string
containing the contents of *format and associated args (size is
calculated with g_printf_string_upper_bound()).
(g_strdup_printf): new function which wraps g_strdup_vprintf().
* configure.in: check for va_copy() or __va_copy() alternatively.
check whether va_lists can be copyied by value.
* glib.h: provide a definition for G_VA_COPY.
* glib.h:
* gmessages.c:
(g_logv):
(g_vsnprintf):
pass va_lists by value, not by reference, since this causes problems
on platforms that implement va_list as as arrays. internaly, use
G_VA_COPY (new_arg, org_arg); va_end (new_arg); to produce a second
va_list variable, if multiple passes are required. changed all
callers.
* glib.h:
* gerror.h:
renamed g_debug() to g_on_error_query(), cleaned up a bit.
renamed g_stack_trace() to g_on_error_stack_trace() since both
functions cluttered different namespaces.
there is an appropriate comment in glib.h now that explains the
unix and gdb specific dependencies of both functions.
removed g_attach_process().
g_on_error_stack_trace() should probably be handled with caution,
i've seem several different linux versions (2.0.x) become unstable
after invokation of this function.
1998-08-24 07:26:53 +02:00
|
|
|
va_start (args, fmt);
|
|
|
|
g_string_sprintfa_int (string, fmt, args);
|
|
|
|
va_end (args);
|
1998-06-11 01:21:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
g_string_sprintfa (GString *string,
|
|
|
|
const gchar *fmt,
|
|
|
|
...)
|
|
|
|
{
|
removed this function which was not publically exported in glib.h. to
Mon Aug 24 02:08:56 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gstring.c:
* gstrfuncs.c:
(g_vsprintf): removed this function which was not publically
exported in glib.h. to export it, it should have been named
differently in the first place, since its semantics differ from
vsprintf(). apart from that, it was a possible cause for
problems since it worked on a previously allocated memory area and
was used in a lot places of glib. exporting it would have been a
guararant for problems with threaded programs.
(g_printf_string_upper_bound): exported this function to return
a string size, guarranteed to be big enough to hold the fully
expanded format+args string. added 'q', 'L' and 'll' flag handling.
in fact, the newly allocated area is in most cases much bigger than
required.
(g_strdup_vprintf()): new function returning a newly allocated string
containing the contents of *format and associated args (size is
calculated with g_printf_string_upper_bound()).
(g_strdup_printf): new function which wraps g_strdup_vprintf().
* configure.in: check for va_copy() or __va_copy() alternatively.
check whether va_lists can be copyied by value.
* glib.h: provide a definition for G_VA_COPY.
* glib.h:
* gmessages.c:
(g_logv):
(g_vsnprintf):
pass va_lists by value, not by reference, since this causes problems
on platforms that implement va_list as as arrays. internaly, use
G_VA_COPY (new_arg, org_arg); va_end (new_arg); to produce a second
va_list variable, if multiple passes are required. changed all
callers.
* glib.h:
* gerror.h:
renamed g_debug() to g_on_error_query(), cleaned up a bit.
renamed g_stack_trace() to g_on_error_stack_trace() since both
functions cluttered different namespaces.
there is an appropriate comment in glib.h now that explains the
unix and gdb specific dependencies of both functions.
removed g_attach_process().
g_on_error_stack_trace() should probably be handled with caution,
i've seem several different linux versions (2.0.x) become unstable
after invokation of this function.
1998-08-24 07:26:53 +02:00
|
|
|
va_list args;
|
1998-06-11 01:21:14 +02:00
|
|
|
|
removed this function which was not publically exported in glib.h. to
Mon Aug 24 02:08:56 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gstring.c:
* gstrfuncs.c:
(g_vsprintf): removed this function which was not publically
exported in glib.h. to export it, it should have been named
differently in the first place, since its semantics differ from
vsprintf(). apart from that, it was a possible cause for
problems since it worked on a previously allocated memory area and
was used in a lot places of glib. exporting it would have been a
guararant for problems with threaded programs.
(g_printf_string_upper_bound): exported this function to return
a string size, guarranteed to be big enough to hold the fully
expanded format+args string. added 'q', 'L' and 'll' flag handling.
in fact, the newly allocated area is in most cases much bigger than
required.
(g_strdup_vprintf()): new function returning a newly allocated string
containing the contents of *format and associated args (size is
calculated with g_printf_string_upper_bound()).
(g_strdup_printf): new function which wraps g_strdup_vprintf().
* configure.in: check for va_copy() or __va_copy() alternatively.
check whether va_lists can be copyied by value.
* glib.h: provide a definition for G_VA_COPY.
* glib.h:
* gmessages.c:
(g_logv):
(g_vsnprintf):
pass va_lists by value, not by reference, since this causes problems
on platforms that implement va_list as as arrays. internaly, use
G_VA_COPY (new_arg, org_arg); va_end (new_arg); to produce a second
va_list variable, if multiple passes are required. changed all
callers.
* glib.h:
* gerror.h:
renamed g_debug() to g_on_error_query(), cleaned up a bit.
renamed g_stack_trace() to g_on_error_stack_trace() since both
functions cluttered different namespaces.
there is an appropriate comment in glib.h now that explains the
unix and gdb specific dependencies of both functions.
removed g_attach_process().
g_on_error_stack_trace() should probably be handled with caution,
i've seem several different linux versions (2.0.x) become unstable
after invokation of this function.
1998-08-24 07:26:53 +02:00
|
|
|
va_start (args, fmt);
|
|
|
|
g_string_sprintfa_int (string, fmt, args);
|
|
|
|
va_end (args);
|
1998-06-11 01:21:14 +02:00
|
|
|
}
|