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

add -DG_DISABLED_DEPRECATED

Browse Source 
Tue Oct 15 15:07:45 2002  Manish Singh  <yosh@gimp.org>

        * gmodule/Makefile.am gobject/Makefile.am gthread/Makefile.am:
        add -DG_DISABLED_DEPRECATED

        * tests/gio-test.c tests/mainloop-test.c tests/string-test.c
        tests/testglib.c test/tree-test.c tests/unicode-collate.c
        tests/unicode-normalize.c: Deprecation cleanup
This commit is contained in:
Manish Singh 2002-10-15 22:16:57 +00:00 committed by Manish Singh
parent 1565a2027e
commit d1f37d5053
17 changed files with 103 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Tue Oct 15 15:07:45 2002 Manish Singh <yosh@gimp.org>
* gmodule/Makefile.am gobject/Makefile.am gthread/Makefile.am:
add -DG_DISABLED_DEPRECATED
* tests/gio-test.c tests/mainloop-test.c tests/string-test.c
tests/testglib.c test/tree-test.c tests/unicode-collate.c
tests/unicode-normalize.c: Deprecation cleanup
Mon Oct 14 15:51:05 2002 Owen Taylor <otaylor@redhat.com> Mon Oct 14 15:51:05 2002 Owen Taylor <otaylor@redhat.com>
* glib/gdate.c (g_date_fill_parse_tokens): Fix a memory * glib/gdate.c (g_date_fill_parse_tokens): Fix a memory

9
ChangeLog.pre-2-10
View File

@ -1,3 +1,12 @@
Tue Oct 15 15:07:45 2002 Manish Singh <yosh@gimp.org>
* gmodule/Makefile.am gobject/Makefile.am gthread/Makefile.am:
add -DG_DISABLED_DEPRECATED
* tests/gio-test.c tests/mainloop-test.c tests/string-test.c
tests/testglib.c test/tree-test.c tests/unicode-collate.c
tests/unicode-normalize.c: Deprecation cleanup
Mon Oct 14 15:51:05 2002 Owen Taylor <otaylor@redhat.com> Mon Oct 14 15:51:05 2002 Owen Taylor <otaylor@redhat.com>
* glib/gdate.c (g_date_fill_parse_tokens): Fix a memory * glib/gdate.c (g_date_fill_parse_tokens): Fix a memory

9
ChangeLog.pre-2-12
View File

@ -1,3 +1,12 @@
Tue Oct 15 15:07:45 2002 Manish Singh <yosh@gimp.org>
* gmodule/Makefile.am gobject/Makefile.am gthread/Makefile.am:
add -DG_DISABLED_DEPRECATED
* tests/gio-test.c tests/mainloop-test.c tests/string-test.c
tests/testglib.c test/tree-test.c tests/unicode-collate.c
tests/unicode-normalize.c: Deprecation cleanup
Mon Oct 14 15:51:05 2002 Owen Taylor <otaylor@redhat.com> Mon Oct 14 15:51:05 2002 Owen Taylor <otaylor@redhat.com>
* glib/gdate.c (g_date_fill_parse_tokens): Fix a memory * glib/gdate.c (g_date_fill_parse_tokens): Fix a memory

9
ChangeLog.pre-2-2
View File

@ -1,3 +1,12 @@
Tue Oct 15 15:07:45 2002 Manish Singh <yosh@gimp.org>
* gmodule/Makefile.am gobject/Makefile.am gthread/Makefile.am:
add -DG_DISABLED_DEPRECATED
* tests/gio-test.c tests/mainloop-test.c tests/string-test.c
tests/testglib.c test/tree-test.c tests/unicode-collate.c
tests/unicode-normalize.c: Deprecation cleanup
Mon Oct 14 15:51:05 2002 Owen Taylor <otaylor@redhat.com> Mon Oct 14 15:51:05 2002 Owen Taylor <otaylor@redhat.com>
* glib/gdate.c (g_date_fill_parse_tokens): Fix a memory * glib/gdate.c (g_date_fill_parse_tokens): Fix a memory

9
ChangeLog.pre-2-4
View File

@ -1,3 +1,12 @@
Tue Oct 15 15:07:45 2002 Manish Singh <yosh@gimp.org>
* gmodule/Makefile.am gobject/Makefile.am gthread/Makefile.am:
add -DG_DISABLED_DEPRECATED
* tests/gio-test.c tests/mainloop-test.c tests/string-test.c
tests/testglib.c test/tree-test.c tests/unicode-collate.c
tests/unicode-normalize.c: Deprecation cleanup
Mon Oct 14 15:51:05 2002 Owen Taylor <otaylor@redhat.com> Mon Oct 14 15:51:05 2002 Owen Taylor <otaylor@redhat.com>
* glib/gdate.c (g_date_fill_parse_tokens): Fix a memory * glib/gdate.c (g_date_fill_parse_tokens): Fix a memory

9
ChangeLog.pre-2-6
View File

@ -1,3 +1,12 @@
Tue Oct 15 15:07:45 2002 Manish Singh <yosh@gimp.org>
* gmodule/Makefile.am gobject/Makefile.am gthread/Makefile.am:
add -DG_DISABLED_DEPRECATED
* tests/gio-test.c tests/mainloop-test.c tests/string-test.c
tests/testglib.c test/tree-test.c tests/unicode-collate.c
tests/unicode-normalize.c: Deprecation cleanup
Mon Oct 14 15:51:05 2002 Owen Taylor <otaylor@redhat.com> Mon Oct 14 15:51:05 2002 Owen Taylor <otaylor@redhat.com>
* glib/gdate.c (g_date_fill_parse_tokens): Fix a memory * glib/gdate.c (g_date_fill_parse_tokens): Fix a memory

9
ChangeLog.pre-2-8
View File

@ -1,3 +1,12 @@
Tue Oct 15 15:07:45 2002 Manish Singh <yosh@gimp.org>
* gmodule/Makefile.am gobject/Makefile.am gthread/Makefile.am:
add -DG_DISABLED_DEPRECATED
* tests/gio-test.c tests/mainloop-test.c tests/string-test.c
tests/testglib.c test/tree-test.c tests/unicode-collate.c
tests/unicode-normalize.c: Deprecation cleanup
Mon Oct 14 15:51:05 2002 Owen Taylor <otaylor@redhat.com> Mon Oct 14 15:51:05 2002 Owen Taylor <otaylor@redhat.com>
* glib/gdate.c (g_date_fill_parse_tokens): Fix a memory * glib/gdate.c (g_date_fill_parse_tokens): Fix a memory

2
gmodule/Makefile.am
View File

@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gmodule \ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gmodule \
-DG_LOG_DOMAIN=\"GModule\" @GLIB_DEBUG_FLAGS@ -DG_LOG_DOMAIN=\"GModule\" @GLIB_DEBUG_FLAGS@ -DG_DISABLE_DEPRECATED
EXTRA_DIST = \ EXTRA_DIST = \
makefile.mingw.in \ makefile.mingw.in \

1
gobject/Makefile.am
View File

@ -9,6 +9,7 @@ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir)/glib \ -I$(top_srcdir)/glib \
-I$(top_builddir) \ -I$(top_builddir) \
@GLIB_DEBUG_FLAGS@ \ @GLIB_DEBUG_FLAGS@ \
-DG_DISABLE_DEPRECATED \
-DGOBJECT_COMPILATION \ -DGOBJECT_COMPILATION \
-DG_DISABLE_CONST_RETURNS \ -DG_DISABLE_CONST_RETURNS \
@STRIP_END@ @STRIP_END@

2
gthread/Makefile.am
View File

@ -2,7 +2,7 @@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gthread \ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gthread \
-DG_LOG_DOMAIN=\"GThread\" @GTHREAD_COMPILE_IMPL_DEFINES@ \ -DG_LOG_DOMAIN=\"GThread\" @GTHREAD_COMPILE_IMPL_DEFINES@ \
@GLIB_DEBUG_FLAGS@ @GLIB_DEBUG_FLAGS@ -DG_DISABLE_DEPRECATED
EXTRA_DIST = \ EXTRA_DIST = \
makefile.mingw.in \ makefile.mingw.in \

6
tests/gio-test.c
View File

@ -105,7 +105,7 @@ shutdown_source (gpointer data)
{ {
nrunning--; nrunning--;
if (nrunning == 0) if (nrunning == 0)
g_main_quit (main_loop); g_main_loop_quit (main_loop);
} }
} }
@ -367,9 +367,9 @@ main (int argc,
#endif #endif
} }
main_loop = g_main_new (FALSE); main_loop = g_main_loop_new (NULL, FALSE);
g_main_run (main_loop); g_main_loop_run (main_loop);
} }
else if (argc == 3) else if (argc == 3)
{ {

10
tests/mainloop-test.c
View File

@ -167,10 +167,8 @@ adder_thread (gpointer data)
g_source_attach (timeout_source, context); g_source_attach (timeout_source, context);
g_source_unref (timeout_source); g_source_unref (timeout_source);
g_main_run (addr_data.loop); g_main_loop_run (addr_data.loop);
g_io_channel_close (channels[0]);
g_io_channel_close (channels[1]);
g_io_channel_unref (channels[0]); g_io_channel_unref (channels[0]);
g_io_channel_unref (channels[1]); g_io_channel_unref (channels[1]);
@ -204,6 +202,9 @@ io_pipe (GIOChannel **channels)
channels[0] = g_io_channel_unix_new (fds[0]); channels[0] = g_io_channel_unix_new (fds[0]);
channels[1] = g_io_channel_unix_new (fds[1]); channels[1] = g_io_channel_unix_new (fds[1]);
g_io_channel_set_close_on_unref (channels[0], TRUE);
g_io_channel_set_close_on_unref (channels[1], TRUE);
} }
void void
@ -242,9 +243,6 @@ adder_response (GIOChannel *source,
exit (1); exit (1);
} }
g_io_channel_close (source);
g_io_channel_close (test_data->in);
g_io_channel_unref (source); g_io_channel_unref (source);
g_io_channel_unref (test_data->in); g_io_channel_unref (test_data->in);

24
tests/string-test.c
View File

@ -107,19 +107,19 @@ main (int argc,
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
/* MSVC and mingw32 use the same run-time C library, which doesn't like /* MSVC and mingw32 use the same run-time C library, which doesn't like
the %10000.10000f format... */ the %10000.10000f format... */
g_string_sprintf (string2, "%s|%0100d|%s|%s|%0*d|%*.*f|%10000.10000f", g_string_printf (string2, "%s|%0100d|%s|%s|%0*d|%*.*f|%10000.10000f",
"this pete guy sure is a wuss, like he's the number ", "this pete guy sure is a wuss, like he's the number ",
1, 1,
" wuss. everyone agrees.\n", " wuss. everyone agrees.\n",
string1->str, string1->str,
10, 666, 15, 15, 666.666666666, 666.666666666); 10, 666, 15, 15, 666.666666666, 666.666666666);
#else #else
g_string_sprintf (string2, "%s|%0100d|%s|%s|%0*d|%*.*f|%100.100f", g_string_printf (string2, "%s|%0100d|%s|%s|%0*d|%*.*f|%100.100f",
"this pete guy sure is a wuss, like he's the number ", "this pete guy sure is a wuss, like he's the number ",
1, 1,
" wuss. everyone agrees.\n", " wuss. everyone agrees.\n",
string1->str, string1->str,
10, 666, 15, 15, 666.666666666, 666.666666666); 10, 666, 15, 15, 666.666666666, 666.666666666);
#endif #endif
g_string_free (string1, TRUE); g_string_free (string1, TRUE);

28
tests/testglib.c
View File

@ -672,7 +672,7 @@ main (int argc,
g_print ("tree nnodes: %d\n", g_tree_nnodes (tree)); g_print ("tree nnodes: %d\n", g_tree_nnodes (tree));
g_print ("tree: "); g_print ("tree: ");
g_tree_traverse (tree, my_traverse, G_IN_ORDER, NULL); g_tree_foreach (tree, my_traverse, NULL);
g_print ("\n"); g_print ("\n");
for (i = 0; i < 10; i++) for (i = 0; i < 10; i++)
@ -682,7 +682,7 @@ main (int argc,
g_print ("tree nnodes: %d\n", g_tree_nnodes (tree)); g_print ("tree nnodes: %d\n", g_tree_nnodes (tree));
g_print ("tree: "); g_print ("tree: ");
g_tree_traverse (tree, my_traverse, G_IN_ORDER, NULL); g_tree_foreach (tree, my_traverse, NULL);
g_print ("\n"); g_print ("\n");
g_print ("ok\n"); g_print ("ok\n");
@ -810,19 +810,19 @@ main (int argc,
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
/* MSVC, mingw32 and LCC use the same run-time C library, which doesn't like /* MSVC, mingw32 and LCC use the same run-time C library, which doesn't like
the %10000.10000f format... */ the %10000.10000f format... */
g_string_sprintf (string2, "%s|%0100d|%s|%s|%0*d|%*.*f|%10000.10000f", g_string_printf (string2, "%s|%0100d|%s|%s|%0*d|%*.*f|%10000.10000f",
"this pete guy sure is a wuss, like he's the number ", "this pete guy sure is a wuss, like he's the number ",
1, 1,
" wuss. everyone agrees.\n", " wuss. everyone agrees.\n",
string1->str, string1->str,
10, 666, 15, 15, 666.666666666, 666.666666666); 10, 666, 15, 15, 666.666666666, 666.666666666);
#else #else
g_string_sprintf (string2, "%s|%0100d|%s|%s|%0*d|%*.*f|%100.100f", g_string_printf (string2, "%s|%0100d|%s|%s|%0*d|%*.*f|%100.100f",
"this pete guy sure is a wuss, like he's the number ", "this pete guy sure is a wuss, like he's the number ",
1, 1,
" wuss. everyone agrees.\n", " wuss. everyone agrees.\n",
string1->str, string1->str,
10, 666, 15, 15, 666.666666666, 666.666666666); 10, 666, 15, 15, 666.666666666, 666.666666666);
#endif #endif
g_print ("string2 length = %lu...\n", (gulong)string2->len); g_print ("string2 length = %lu...\n", (gulong)string2->len);

4
tests/tree-test.c
View File

@ -103,14 +103,14 @@ main (int argc,
g_tree_insert (tree, &chars[i], &chars[i]); g_tree_insert (tree, &chars[i], &chars[i]);
} }
g_tree_traverse (tree, my_traverse, G_IN_ORDER, NULL); g_tree_foreach (tree, my_traverse, NULL);
g_assert (g_tree_nnodes (tree) == (10 + 26 + 26)); g_assert (g_tree_nnodes (tree) == (10 + 26 + 26));
for (i = 0; i < 10; i++) for (i = 0; i < 10; i++)
g_tree_remove (tree, &chars[i]); g_tree_remove (tree, &chars[i]);
g_tree_traverse (tree, my_traverse, G_IN_ORDER, NULL); g_tree_foreach (tree, my_traverse, NULL);
return 0; return 0;
} }

2
tests/unicode-collate.c
View File

@ -92,7 +92,7 @@ int main (int argc, char **argv)
for (i = 0; i < line_array->len; i++) for (i = 0; i < line_array->len; i++)
printf ("%s\n", g_array_index (line_array, Line, i).str); printf ("%s\n", g_array_index (line_array, Line, i).str);
g_io_channel_close (in); g_io_channel_unref (in);
return 0; return 0;
} }

2
tests/unicode-normalize.c
View File

@ -191,7 +191,7 @@ int main (int argc, char **argv)
return 1; return 1;
} }
g_io_channel_close (in); g_io_channel_unref (in);
g_string_free (buffer, TRUE); g_string_free (buffer, TRUE);
return !success; return !success;