luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-07 19:35:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

glib/gconvert.c glib/gen-unicode-tables.pl fixed cast/type problems to

Browse Source 
2002-03-13  Erwann Chenede  <erwann.chenede@sun.com>
  * glib/gconvert.c
  * glib/gen-unicode-tables.pl
  * glib/gunidecomp.h : fixed cast/type problems to
    avoid warnings (with forte compiler)
  * gobject/gclosure.c
  * gobject/gobject.c
  * gobject/gsignal.c: fixed cast problems with function pointer
    to avoid warnings (with forte compiler) (#73898)
This commit is contained in:
Erwann Chenede 2002-03-13 15:36:04 +00:00 committed by Erwann Chenede
parent 428704a0b6
commit 738c1cfd6b
15 changed files with 71 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2002-03-13 Erwann Chenede <erwann.chenede@sun.com>
* glib/gconvert.c
glib/gen-unicode-tables.pl
glib/gunidecomp.h : fixed cast/type problems to
avoid warnings (with forte compiler) (#73898)
2002-03-12 Alexander Larsson <alla@lysator.liu.se> 2002-03-12 Alexander Larsson <alla@lysator.liu.se>
* glib/gconvert.c: * glib/gconvert.c:

6
ChangeLog.pre-2-0
View File

@ -1,3 +1,9 @@
2002-03-13 Erwann Chenede <erwann.chenede@sun.com>
* glib/gconvert.c
glib/gen-unicode-tables.pl
glib/gunidecomp.h : fixed cast/type problems to
avoid warnings (with forte compiler) (#73898)
2002-03-12 Alexander Larsson <alla@lysator.liu.se> 2002-03-12 Alexander Larsson <alla@lysator.liu.se>
* glib/gconvert.c: * glib/gconvert.c:

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
2002-03-13 Erwann Chenede <erwann.chenede@sun.com>
* glib/gconvert.c
glib/gen-unicode-tables.pl
glib/gunidecomp.h : fixed cast/type problems to
avoid warnings (with forte compiler) (#73898)
2002-03-12 Alexander Larsson <alla@lysator.liu.se> 2002-03-12 Alexander Larsson <alla@lysator.liu.se>
* glib/gconvert.c: * glib/gconvert.c:

6
ChangeLog.pre-2-12
View File

@ -1,3 +1,9 @@
2002-03-13 Erwann Chenede <erwann.chenede@sun.com>
* glib/gconvert.c
glib/gen-unicode-tables.pl
glib/gunidecomp.h : fixed cast/type problems to
avoid warnings (with forte compiler) (#73898)
2002-03-12 Alexander Larsson <alla@lysator.liu.se> 2002-03-12 Alexander Larsson <alla@lysator.liu.se>
* glib/gconvert.c: * glib/gconvert.c:

6
ChangeLog.pre-2-2
View File

@ -1,3 +1,9 @@
2002-03-13 Erwann Chenede <erwann.chenede@sun.com>
* glib/gconvert.c
glib/gen-unicode-tables.pl
glib/gunidecomp.h : fixed cast/type problems to
avoid warnings (with forte compiler) (#73898)
2002-03-12 Alexander Larsson <alla@lysator.liu.se> 2002-03-12 Alexander Larsson <alla@lysator.liu.se>
* glib/gconvert.c: * glib/gconvert.c:

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
2002-03-13 Erwann Chenede <erwann.chenede@sun.com>
* glib/gconvert.c
glib/gen-unicode-tables.pl
glib/gunidecomp.h : fixed cast/type problems to
avoid warnings (with forte compiler) (#73898)
2002-03-12 Alexander Larsson <alla@lysator.liu.se> 2002-03-12 Alexander Larsson <alla@lysator.liu.se>
* glib/gconvert.c: * glib/gconvert.c:

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
2002-03-13 Erwann Chenede <erwann.chenede@sun.com>
* glib/gconvert.c
glib/gen-unicode-tables.pl
glib/gunidecomp.h : fixed cast/type problems to
avoid warnings (with forte compiler) (#73898)
2002-03-12 Alexander Larsson <alla@lysator.liu.se> 2002-03-12 Alexander Larsson <alla@lysator.liu.se>
* glib/gconvert.c: * glib/gconvert.c:

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
2002-03-13 Erwann Chenede <erwann.chenede@sun.com>
* glib/gconvert.c
glib/gen-unicode-tables.pl
glib/gunidecomp.h : fixed cast/type problems to
avoid warnings (with forte compiler) (#73898)
2002-03-12 Alexander Larsson <alla@lysator.liu.se> 2002-03-12 Alexander Larsson <alla@lysator.liu.se>
* glib/gconvert.c: * glib/gconvert.c:

14
glib/gconvert.c
View File

@ -196,7 +196,7 @@ struct _iconv_cache_bucket {
gchar *key; gchar *key;
guint32 refcount; guint32 refcount;
gboolean used; gboolean used;
iconv_t cd; GIConv cd;
}; };
static GList *iconv_cache_list; static GList *iconv_cache_list;
@ -233,7 +233,7 @@ iconv_cache_init (void)
* Returns a pointer to the newly allocated cache bucket. * Returns a pointer to the newly allocated cache bucket.
**/ **/
struct _iconv_cache_bucket * struct _iconv_cache_bucket *
iconv_cache_bucket_new (const gchar *key, iconv_t cd) iconv_cache_bucket_new (const gchar *key, GIConv cd)
{ {
struct _iconv_cache_bucket *bucket; struct _iconv_cache_bucket *bucket;
@ -349,7 +349,7 @@ open_converter (const gchar *to_codeset,
if (bucket->used) if (bucket->used)
{ {
cd = g_iconv_open (to_codeset, from_codeset); cd = g_iconv_open (to_codeset, from_codeset);
if (cd == (iconv_t) -1) if (cd == (GIConv) -1)
goto error; goto error;
} }
else else
@ -366,7 +366,7 @@ open_converter (const gchar *to_codeset,
else else
{ {
cd = g_iconv_open (to_codeset, from_codeset); cd = g_iconv_open (to_codeset, from_codeset);
if (cd == (iconv_t) -1) if (cd == (GIConv) -1)
goto error; goto error;
iconv_cache_expire_unused (); iconv_cache_expire_unused ();
@ -402,11 +402,11 @@ close_converter (GIConv converter)
{ {
struct _iconv_cache_bucket *bucket; struct _iconv_cache_bucket *bucket;
const gchar *key; const gchar *key;
iconv_t cd; GIConv cd;
cd = (iconv_t) converter; cd = converter;
if (cd == (iconv_t) -1) if (cd == (GIConv) -1)
return 0; return 0;
G_LOCK (iconv_cache_lock); G_LOCK (iconv_cache_lock);

2
glib/gen-unicode-tables.pl
View File

@ -768,7 +768,7 @@ sub print_decomp
} }
print OUT "\n};\n\n"; print OUT "\n};\n\n";
printf OUT "static const char decomp_expansion_string[] = %s;\n\n", $decomp_string; printf OUT "static const guchar decomp_expansion_string[] = %s;\n\n", $decomp_string;
print OUT "#endif /* DECOMP_H */\n"; print OUT "#endif /* DECOMP_H */\n";

2
glib/gunidecomp.h
View File

@ -4019,7 +4019,7 @@ static const decomposition decomp_table[] =
{ 0xffee, 255, 0, 16468 } { 0xffee, 255, 0, 16468 }
}; };
static const char decomp_expansion_string[] = static const guchar decomp_expansion_string[] =
"\x00\x20\0\0" /* offset 0 */ "\x00\x20\0\0" /* offset 0 */
"\x00\x20\x03\x08\0\0" /* offset 4 */ "\x00\x20\x03\x08\0\0" /* offset 4 */
"\x00\x61\0\0" /* offset 10 */ "\x00\x61\0\0" /* offset 10 */

7
gobject/ChangeLog
View File

@ -1,3 +1,10 @@
2002-03-13 Erwann Chenede <erwann.chenede@sun.com>
* gobject/gclosure.c
* gobject/gobject.c
* gobject/gsignal.c: fixed cast problems with function pointer
to avoid warnings (with forte compiler) (#73898)
2002-03-05 Sven Neumann <sven@gimp.org> 2002-03-05 Sven Neumann <sven@gimp.org>
* gvaluetransform.c (g_value_transforms_init): don't try to * gvaluetransform.c (g_value_transforms_init): don't try to

8
gobject/gclosure.c
View File

@ -104,7 +104,7 @@ closure_invoke_notifiers (GClosure *closure,
register guint n = --closure->n_fnotifiers; register guint n = --closure->n_fnotifiers;
ndata = closure->notifiers + CLOSURE_N_MFUNCS (closure) + n; ndata = closure->notifiers + CLOSURE_N_MFUNCS (closure) + n;
closure->marshal = (gpointer) ndata->notify; closure->marshal = (GClosureMarshal) ndata->notify;
closure->data = ndata->data; closure->data = ndata->data;
ndata->notify (ndata->data, closure); ndata->notify (ndata->data, closure);
} }
@ -118,7 +118,7 @@ closure_invoke_notifiers (GClosure *closure,
register guint n = --closure->n_inotifiers; register guint n = --closure->n_inotifiers;
ndata = closure->notifiers + CLOSURE_N_MFUNCS (closure) + closure->n_fnotifiers + n; ndata = closure->notifiers + CLOSURE_N_MFUNCS (closure) + closure->n_fnotifiers + n;
closure->marshal = (gpointer) ndata->notify; closure->marshal = (GClosureMarshal) ndata->notify;
closure->data = ndata->data; closure->data = ndata->data;
ndata->notify (ndata->data, closure); ndata->notify (ndata->data, closure);
} }
@ -472,7 +472,7 @@ g_cclosure_new (GCallback callback_func,
closure = g_closure_new_simple (sizeof (GCClosure), user_data); closure = g_closure_new_simple (sizeof (GCClosure), user_data);
if (destroy_data) if (destroy_data)
g_closure_add_finalize_notifier (closure, user_data, destroy_data); g_closure_add_finalize_notifier (closure, user_data, destroy_data);
((GCClosure*) closure)->callback = callback_func; ((GCClosure*) closure)->callback = (gpointer) callback_func;
return closure; return closure;
} }
@ -489,7 +489,7 @@ g_cclosure_new_swap (GCallback callback_func,
closure = g_closure_new_simple (sizeof (GCClosure), user_data); closure = g_closure_new_simple (sizeof (GCClosure), user_data);
if (destroy_data) if (destroy_data)
g_closure_add_finalize_notifier (closure, user_data, destroy_data); g_closure_add_finalize_notifier (closure, user_data, destroy_data);
((GCClosure*) closure)->callback = callback_func; ((GCClosure*) closure)->callback = (gpointer) callback_func;
closure->derivative_flag = TRUE; closure->derivative_flag = TRUE;
return closure; return closure;

2
gobject/gobject.c
View File

@ -1168,7 +1168,7 @@ g_object_disconnect (gpointer _object,
g_warning ("%s: invalid signal name \"%s\"", G_STRLOC, signal_spec); g_warning ("%s: invalid signal name \"%s\"", G_STRLOC, signal_spec);
else if (!g_signal_handlers_disconnect_matched (object, mask | (detail ? G_SIGNAL_MATCH_DETAIL : 0), else if (!g_signal_handlers_disconnect_matched (object, mask | (detail ? G_SIGNAL_MATCH_DETAIL : 0),
sid, detail, sid, detail,
NULL, callback, data)) NULL, (gpointer)callback, data))
g_warning (G_STRLOC ": signal handler %p(%p) is not connected", callback, data); g_warning (G_STRLOC ": signal handler %p(%p) is not connected", callback, data);
signal_spec = va_arg (var_args, gchar*); signal_spec = va_arg (var_args, gchar*);
} }

4
gobject/gsignal.c
View File

@ -829,7 +829,7 @@ g_signal_add_emission_hook (guint signal_id,
} }
hook = g_hook_alloc (node->emission_hooks); hook = g_hook_alloc (node->emission_hooks);
hook->data = hook_data; hook->data = hook_data;
hook->func = hook_func; hook->func = (gpointer) hook_func;
hook->destroy = data_destroy; hook->destroy = data_destroy;
signal_hook = SIGNAL_HOOK (hook); signal_hook = SIGNAL_HOOK (hook);
signal_hook->detail = detail; signal_hook->detail = detail;
@ -2298,7 +2298,7 @@ signal_emit_unlocked_R (SignalNode *node,
if (!signal_hook->detail || signal_hook->detail == detail) if (!signal_hook->detail || signal_hook->detail == detail)
{ {
GSignalEmissionHook hook_func = hook->func; GSignalEmissionHook hook_func = (GSignalEmissionHook) hook->func;
was_in_call = G_HOOK_IN_CALL (hook); was_in_call = G_HOOK_IN_CALL (hook);
hook->flags |= G_HOOK_FLAG_IN_CALL; hook->flags |= G_HOOK_FLAG_IN_CALL;