mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-01-27 06:26:15 +01: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 **.
107 lines
3.3 KiB
C
107 lines
3.3 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_CONVERT_H__
|
|
#define __G_CONVERT_H__
|
|
|
|
#include <stddef.h> /* For size_t */
|
|
#include <gerror.h>
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
typedef enum
|
|
{
|
|
G_CONVERT_ERROR_NO_CONVERSION,
|
|
G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
|
|
G_CONVERT_ERROR_FAILED,
|
|
G_CONVERT_ERROR_PARTIAL_INPUT
|
|
} GConvertError;
|
|
|
|
#define G_CONVERT_ERROR g_convert_error_quark()
|
|
GQuark g_convert_error_quark (void);
|
|
|
|
/* Thin wrappers around iconv
|
|
*/
|
|
typedef struct _GIConv *GIConv;
|
|
|
|
GIConv g_iconv_open (const gchar *to_codeset,
|
|
const gchar *from_codeset);
|
|
size_t g_iconv (GIConv converter,
|
|
gchar **inbuf,
|
|
gsize *inbytes_left,
|
|
gchar **outbuf,
|
|
gsize *outbytes_left);
|
|
gint g_iconv_close (GIConv converter);
|
|
|
|
|
|
gchar* g_convert (const gchar *str,
|
|
gssize len,
|
|
const gchar *to_codeset,
|
|
const gchar *from_codeset,
|
|
gsize *bytes_read,
|
|
gsize *bytes_written,
|
|
GError **error);
|
|
gchar* g_convert_with_fallback (const gchar *str,
|
|
gssize len,
|
|
const gchar *to_codeset,
|
|
const gchar *from_codeset,
|
|
gchar *fallback,
|
|
gsize *bytes_read,
|
|
gsize *bytes_written,
|
|
GError **error);
|
|
|
|
|
|
/* Convert between libc's idea of strings and UTF-8.
|
|
*/
|
|
gchar* g_locale_to_utf8 (const gchar *opsysstring,
|
|
gssize len,
|
|
gsize *bytes_read,
|
|
gsize *bytes_written,
|
|
GError **error);
|
|
gchar* g_locale_from_utf8 (const gchar *utf8string,
|
|
gssize len,
|
|
gsize *bytes_read,
|
|
gsize *bytes_written,
|
|
GError **error);
|
|
|
|
/* Convert between the operating system (or C runtime)
|
|
* representation of file names and UTF-8.
|
|
*/
|
|
gchar* g_filename_to_utf8 (const gchar *opsysstring,
|
|
gssize len,
|
|
gsize *bytes_read,
|
|
gsize *bytes_written,
|
|
GError **error);
|
|
gchar* g_filename_from_utf8 (const gchar *utf8string,
|
|
gssize len,
|
|
gsize *bytes_read,
|
|
gsize *bytes_written,
|
|
GError **error);
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* __G_CONVERT_H__ */
|