mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-09-20 17:26:14 +02:00
f5c28ce4ab
Wed Jun 20 12:00:54 2001 Owen Taylor <otaylor@redhat.com>
Changes for 64-bit cleanliness, loosely based on patch
from Mark Murnane.
* gconvert.c (g_convert/g_convert_with_fallback): Remove
workarounds for since-fixed GNU libc bugs. Minor
doc fix.
* gconvert.[ch]: Change gint to gsize/gssize as
appropriate.
* gconvert.c (g_locale/filename_to/from_utf8): Fix incorrect
computation of bytes_read / bytes_written.
* gfileutils.[ch] (g_file_get_contents): Make length
out parameter 'gsize *len'.
* ghook.c (g_hook_compare_ids): Don't compare a
and b as 'a - b'.
* gmacros.h (GSIZE_TO_POINTER): Add GPOINTER_TO_SIZE,
GSIZE_TO_POINTER.
* gmain.c (g_timeout_prepare): Rewrite to avoid
overflows. (Fixes bug when system clock skews
backwards more than 24 days.)
* gmarkup.[ch]: Make lengths passed to callbacks
gsize, length for g_markup_parse-context_parse(),
g_markup_escape_text() gssize.
* gmessages.[ch] (g_printf_string_upper_bound): Change
return value to gsize.
* gmessages.c (printf_string_upper_bound): Remove
a ridiculous use of 'inline' on a 300 line function.
* gstring.[ch]: Represent size of string as a gsize,
not gint. Make parameters to functions take gsize,
or gssize where -1 is allowed.
* gstring.c (g_string_erase): Make
g_string_erase (string, pos, -1) a synonym for
g_string_truncate for consistency with other G*
APIs.
* gstrfuncs.[ch]: Make all functions taking a string
length, take a gsize, or gssize if -1 is allowed.
(g_strstr_len, g_strrstr_len). Also fix some boundary
conditions in g_str[r]str[_len].
* gutf8.c tests/unicode-encoding.c: Make parameters that
are byte lengths gsize, gssize as appropriate. Make
character offsets, other counts, glong.
* gasyncqueue.c gcompletion.c
timeloop.c timeloop-basic.c gutils.c gspawn.c.
Small 64 bit cleanliness fixups.
* glist.c (g_list_sort2, g_list_sort_real): Fix functions
that should have been static.
* gdate.c (g_date_fill_parse_tokens): Fix extra
declaration that was shadowing another.
* tests/module-test.c: Include string.h
Mon Jun 18 15:43:29 2001 Owen Taylor <otaylor@redhat.com>
* gutf8.c (g_get_charset): Make argument
G_CONST_RETURN char **.
137 lines
5.4 KiB
C
137 lines
5.4 KiB
C
/* 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 Lesser 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
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser 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.
|
|
*/
|
|
|
|
/*
|
|
* Modified by the GLib Team and others 1997-2000. 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/.
|
|
*/
|
|
|
|
#ifndef __G_STRFUNCS_H__
|
|
#define __G_STRFUNCS_H__
|
|
|
|
#include <stdarg.h>
|
|
#include <gtypes.h>
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
/* String utility functions that modify a string argument or
|
|
* return a constant string that must not be freed.
|
|
*/
|
|
#define G_STR_DELIMITERS "_-|> <."
|
|
gchar* g_strdelimit (gchar *string,
|
|
const gchar *delimiters,
|
|
gchar new_delimiter);
|
|
gchar* g_strcanon (gchar *string,
|
|
const gchar *valid_chars,
|
|
gchar substitutor);
|
|
gdouble g_strtod (const gchar *nptr,
|
|
gchar **endptr);
|
|
G_CONST_RETURN gchar* g_strerror (gint errnum) G_GNUC_CONST;
|
|
G_CONST_RETURN gchar* g_strsignal (gint signum) G_GNUC_CONST;
|
|
gint g_strcasecmp (const gchar *s1,
|
|
const gchar *s2);
|
|
gint g_strncasecmp (const gchar *s1,
|
|
const gchar *s2,
|
|
gsize n);
|
|
gchar* g_strdown (gchar *string);
|
|
gchar* g_strup (gchar *string);
|
|
gchar* g_strreverse (gchar *string);
|
|
gsize g_strlcpy (gchar *dest,
|
|
const gchar *src,
|
|
gsize dest_size);
|
|
gsize g_strlcat (gchar *dest,
|
|
const gchar *src,
|
|
gsize dest_size);
|
|
gchar * g_strstr_len (const gchar *haystack,
|
|
gssize haystack_len,
|
|
const gchar *needle);
|
|
gchar * g_strrstr (const gchar *haystack,
|
|
const gchar *needle);
|
|
gchar * g_strrstr_len (const gchar *haystack,
|
|
gssize haystack_len,
|
|
const gchar *needle);
|
|
|
|
/* removes leading spaces */
|
|
gchar* g_strchug (gchar *string);
|
|
/* removes trailing spaces */
|
|
gchar* g_strchomp (gchar *string);
|
|
/* removes leading & trailing spaces */
|
|
#define g_strstrip( string ) g_strchomp (g_strchug (string))
|
|
|
|
/* String utility functions that return a newly allocated string which
|
|
* 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,
|
|
...) G_GNUC_PRINTF (1, 2);
|
|
gchar* g_strdup_vprintf (const gchar *format,
|
|
va_list args);
|
|
gchar* g_strndup (const gchar *str,
|
|
gsize n);
|
|
gchar* g_strnfill (gsize length,
|
|
gchar fill_char);
|
|
gchar* g_strconcat (const gchar *string1,
|
|
...); /* NULL terminated */
|
|
gchar* g_strjoin (const gchar *separator,
|
|
...); /* NULL terminated */
|
|
/* 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_strcompress (const gchar *source);
|
|
|
|
/* 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.
|
|
*
|
|
* Deprecated API: gchar* g_strescape (const gchar *source);
|
|
* Luckily this function wasn't used much, using NULL as second parameter
|
|
* provides mostly identical semantics.
|
|
*/
|
|
gchar* g_strescape (const gchar *source,
|
|
const gchar *exceptions);
|
|
|
|
gpointer g_memdup (gconstpointer mem,
|
|
guint byte_size);
|
|
|
|
/* NULL terminated string arrays.
|
|
* g_strsplit() splits up string into max_tokens tokens at delim and
|
|
* returns a newly allocated string array.
|
|
* g_strjoinv() concatenates all of str_array's strings, sliding in an
|
|
* optional separator, the returned string is newly allocated.
|
|
* g_strfreev() frees the array itself and all of its strings.
|
|
* g_strdupv() copies a NULL-terminated array of strings
|
|
*/
|
|
gchar** g_strsplit (const gchar *string,
|
|
const gchar *delimiter,
|
|
gint max_tokens);
|
|
gchar* g_strjoinv (const gchar *separator,
|
|
gchar **str_array);
|
|
void g_strfreev (gchar **str_array);
|
|
gchar** g_strdupv (gchar **str_array);
|
|
|
|
gchar* g_stpcpy (gchar *dest,
|
|
const char *src);
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* __G_STRFUNCS_H__ */
|