From 4aeb06f88358c6b2dff7e0021646dafb380470bd Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 11 Mar 2002 20:21:59 +0000 Subject: [PATCH] Backport from HEAD of fix by Raja R Harinath: (fd_set): Change the grep Mon Mar 11 15:19:01 2002 Owen Taylor * configure.in: Backport from HEAD of fix by Raja R Harinath: (fd_set): Change the grep for `fd_mask' to search for `fd_set'. (#56364) * gcompletion.c (g_completion_complete): Fix memory leak. (#53408, Ron Koerner) --- ChangeLog | 9 + ChangeLog.pre-2-0 | 9 + ChangeLog.pre-2-10 | 9 + ChangeLog.pre-2-12 | 9 + ChangeLog.pre-2-2 | 9 + ChangeLog.pre-2-4 | 9 + ChangeLog.pre-2-6 | 9 + ChangeLog.pre-2-8 | 9 + configure.in | 2 +- gcompletion.c | 11 +- glib/glib.def | 398 ------------------------------------------- glib/makefile.msc.in | 165 ------------------ 12 files changed, 79 insertions(+), 569 deletions(-) delete mode 100644 glib/glib.def delete mode 100644 glib/makefile.msc.in diff --git a/ChangeLog b/ChangeLog index c469ca2b4..48a686ead 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Mon Mar 11 15:19:01 2002 Owen Taylor + + * configure.in: Backport from HEAD of fix by Raja R Harinath: + (fd_set): Change the grep for `fd_mask' to search for `fd_set'. + (#56364) + + * gcompletion.c (g_completion_complete): Fix memory + leak. (#53408, Ron Koerner) + 2002-02-05 Sebastian Wilhelmi * configure.in: Fix test for posix like diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c469ca2b4..48a686ead 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +Mon Mar 11 15:19:01 2002 Owen Taylor + + * configure.in: Backport from HEAD of fix by Raja R Harinath: + (fd_set): Change the grep for `fd_mask' to search for `fd_set'. + (#56364) + + * gcompletion.c (g_completion_complete): Fix memory + leak. (#53408, Ron Koerner) + 2002-02-05 Sebastian Wilhelmi * configure.in: Fix test for posix like diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c469ca2b4..48a686ead 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Mon Mar 11 15:19:01 2002 Owen Taylor + + * configure.in: Backport from HEAD of fix by Raja R Harinath: + (fd_set): Change the grep for `fd_mask' to search for `fd_set'. + (#56364) + + * gcompletion.c (g_completion_complete): Fix memory + leak. (#53408, Ron Koerner) + 2002-02-05 Sebastian Wilhelmi * configure.in: Fix test for posix like diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index c469ca2b4..48a686ead 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,12 @@ +Mon Mar 11 15:19:01 2002 Owen Taylor + + * configure.in: Backport from HEAD of fix by Raja R Harinath: + (fd_set): Change the grep for `fd_mask' to search for `fd_set'. + (#56364) + + * gcompletion.c (g_completion_complete): Fix memory + leak. (#53408, Ron Koerner) + 2002-02-05 Sebastian Wilhelmi * configure.in: Fix test for posix like diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c469ca2b4..48a686ead 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Mon Mar 11 15:19:01 2002 Owen Taylor + + * configure.in: Backport from HEAD of fix by Raja R Harinath: + (fd_set): Change the grep for `fd_mask' to search for `fd_set'. + (#56364) + + * gcompletion.c (g_completion_complete): Fix memory + leak. (#53408, Ron Koerner) + 2002-02-05 Sebastian Wilhelmi * configure.in: Fix test for posix like diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c469ca2b4..48a686ead 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Mon Mar 11 15:19:01 2002 Owen Taylor + + * configure.in: Backport from HEAD of fix by Raja R Harinath: + (fd_set): Change the grep for `fd_mask' to search for `fd_set'. + (#56364) + + * gcompletion.c (g_completion_complete): Fix memory + leak. (#53408, Ron Koerner) + 2002-02-05 Sebastian Wilhelmi * configure.in: Fix test for posix like diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c469ca2b4..48a686ead 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Mon Mar 11 15:19:01 2002 Owen Taylor + + * configure.in: Backport from HEAD of fix by Raja R Harinath: + (fd_set): Change the grep for `fd_mask' to search for `fd_set'. + (#56364) + + * gcompletion.c (g_completion_complete): Fix memory + leak. (#53408, Ron Koerner) + 2002-02-05 Sebastian Wilhelmi * configure.in: Fix test for posix like diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c469ca2b4..48a686ead 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Mon Mar 11 15:19:01 2002 Owen Taylor + + * configure.in: Backport from HEAD of fix by Raja R Harinath: + (fd_set): Change the grep for `fd_mask' to search for `fd_set'. + (#56364) + + * gcompletion.c (g_completion_complete): Fix memory + leak. (#53408, Ron Koerner) + 2002-02-05 Sebastian Wilhelmi * configure.in: Fix test for posix like diff --git a/configure.in b/configure.in index 1046f7e2b..ee62ded4b 100644 --- a/configure.in +++ b/configure.in @@ -336,7 +336,7 @@ AC_TRY_COMPILE([#include ], if test $gtk_ok = yes; then AC_MSG_RESULT([yes, found in sys/types.h]) else - AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok=yes) + AC_HEADER_EGREP(fd_set, sys/select.h, gtk_ok=yes) if test $gtk_ok = yes; then AC_DEFINE(HAVE_SYS_SELECT_H) AC_MSG_RESULT([yes, found in sys/select.h]) diff --git a/gcompletion.c b/gcompletion.c index 9bc4c9b50..6acc1646d 100644 --- a/gcompletion.c +++ b/gcompletion.c @@ -181,16 +181,17 @@ g_completion_complete (GCompletion* cmp, list = cmp->cache; while (list) { + GList *next = list->next; + if (strncmp (prefix, cmp->func ? cmp->func (list->data) : (gchar*) list->data, len)) { - list = g_list_remove_link (cmp->cache, list); - if (list != cmp->cache) - cmp->cache = list; + cmp->cache = g_list_remove_link (cmp->cache, list); + g_list_free_1 (list); } - else - list = list->next; + + list = next; } done = 1; } diff --git a/glib/glib.def b/glib/glib.def deleted file mode 100644 index d5137484c..000000000 --- a/glib/glib.def +++ /dev/null @@ -1,398 +0,0 @@ -EXPORTS - g_array_append_vals - g_array_free - g_array_insert_vals - g_array_new - g_array_prepend_vals - g_array_remove_index - g_array_remove_index_fast - g_array_set_size - g_atexit - g_basename - g_bit_nth_lsf - g_bit_nth_msf - g_bit_storage - g_blow_chunks - g_byte_array_append - g_byte_array_free - g_byte_array_new - g_byte_array_prepend - g_byte_array_remove_index - g_byte_array_remove_index_fast - g_byte_array_set_size - g_cache_destroy - g_cache_insert - g_cache_key_foreach - g_cache_new - g_cache_remove - g_cache_value_foreach - g_completion_add_items - g_completion_clear_items - g_completion_complete - g_completion_free - g_completion_new - g_completion_remove_items - g_datalist_clear - g_datalist_foreach - g_datalist_id_get_data - g_datalist_id_remove_no_notify - g_datalist_id_set_data_full - g_datalist_init - g_dataset_destroy - g_dataset_foreach - g_dataset_id_get_data - g_dataset_id_remove_no_notify - g_dataset_id_set_data_full - g_date_add_days - g_date_add_months - g_date_add_years - g_date_clear - g_date_compare - g_date_day - g_date_day_of_year - g_date_days_in_month - g_date_free - g_date_is_first_of_month - g_date_is_last_of_month - g_date_is_leap_year - g_date_julian - g_date_julian - g_date_monday_week_of_year - g_date_monday_weeks_in_year - g_date_new - g_date_new_dmy - g_date_new_julian - g_date_month - g_date_set_day - g_date_set_dmy - g_date_set_julian - g_date_set_month - g_date_set_parse - g_date_set_time - g_date_set_year - g_date_strftime - g_date_subtract_days - g_date_subtract_months - g_date_subtract_years - g_date_sunday_week_of_year - g_date_sunday_weeks_in_year - g_date_to_struct_tm - g_date_valid - g_date_valid_day - g_date_valid_dmy - g_date_valid_julian - g_date_valid_month - g_date_valid_weekday - g_date_valid_year - g_date_weekday - g_date_year - g_direct_equal - g_direct_hash - g_dirname - g_free - g_get_current_dir - g_get_current_time - g_get_home_dir - g_get_prgname - g_get_real_name - g_get_tmp_dir - g_get_user_name - g_getenv - g_hash_table_destroy - g_hash_table_foreach - g_hash_table_foreach_remove - g_hash_table_freeze - g_hash_table_insert - g_hash_table_lookup - g_hash_table_lookup_extended - g_hash_table_new - g_hash_table_remove - g_hash_table_size - g_hash_table_thaw - g_hook_alloc - g_hook_compare_ids - g_hook_destroy - g_hook_destroy_link - g_hook_find - g_hook_find_data - g_hook_find_func - g_hook_find_func_data - g_hook_first_valid - g_hook_free - g_hook_get - g_hook_insert_before - g_hook_insert_sorted - g_hook_list_init - g_hook_list_invoke - g_hook_list_invoke_check - g_hook_list_marshal - g_hook_list_marshal_check - g_hook_list_clear - g_hook_next_valid - g_hook_prepend - g_hook_ref - g_hook_unref - g_idle_add - g_idle_add_full - g_idle_remove_by_data - g_int_equal - g_int_hash - g_io_add_watch - g_io_add_watch_full - g_io_channel_close - g_io_channel_init - g_io_channel_read - g_io_channel_ref - g_io_channel_seek - g_io_channel_unix_get_fd - g_io_channel_unix_new - g_io_channel_unref - g_io_channel_win32_get_fd - g_io_channel_win32_new_messages - g_io_channel_win32_new_pipe - g_io_channel_win32_new_pipe_with_wakeups - g_io_channel_win32_new_stream_socket - g_io_channel_win32_pipe_readable - g_io_channel_win32_pipe_request_wakeups - g_io_channel_write - g_list_alloc - g_list_append - g_list_concat - g_list_copy - g_list_find - g_list_find_custom - g_list_first - g_list_foreach - g_list_free - g_list_free_1 - g_list_index - g_list_insert - g_list_insert_sorted - g_list_last - g_list_length - g_list_nth - g_list_nth_data - g_list_position - g_list_prepend - g_list_remove - g_list_remove_link - g_list_reverse - g_list_sort - g_log - g_log_default_handler - g_log_remove_handler - g_log_set_always_fatal - g_log_set_fatal_mask - g_log_set_handler - g_logv - g_main_add_poll - g_main_destroy - g_main_is_running - g_main_iteration - g_main_new - g_main_pending - g_main_remove_poll - g_main_quit - g_main_run - g_main_set_poll_func - g_malloc - g_malloc0 - g_mem_check - g_mem_chunk_alloc - g_mem_chunk_alloc0 - g_mem_chunk_clean - g_mem_chunk_destroy - g_mem_chunk_free - g_mem_chunk_info - g_mem_chunk_new - g_mem_chunk_print - g_mem_chunk_reset - g_mem_init - g_mem_profile - g_memdup - g_messages_init - g_mutex_init - g_node_child_index - g_node_child_position - g_node_children_foreach - g_node_depth - g_node_destroy - g_node_find - g_node_find_child - g_node_first_sibling - g_node_get_root - g_node_insert - g_node_insert_before - g_node_is_ancestor - g_node_last_child - g_node_last_sibling - g_node_max_height - g_node_n_children - g_node_n_nodes - g_node_new - g_node_nth_child - g_node_prepend - g_node_reverse_children - g_node_traverse - g_node_unlink - g_on_error_query - g_on_error_stack_trace - g_parse_debug_string - g_path_is_absolute - g_path_skip_root - g_pipe_readable_msg - g_print - g_printerr - g_printf_string_upper_bound - g_ptr_array_add - g_ptr_array_free - g_ptr_array_new - g_ptr_array_remove - g_ptr_array_remove_fast - g_ptr_array_remove_index - g_ptr_array_remove_index_fast - g_ptr_array_set_size - g_quark_from_static_string - g_quark_from_string - g_quark_to_string - g_quark_try_string - g_realloc - g_relation_count - g_relation_delete - g_relation_destroy - g_relation_exists - g_relation_index - g_relation_insert - g_relation_new - g_relation_print - g_relation_select - g_scanner_cur_line - g_scanner_cur_position - g_scanner_cur_token - g_scanner_cur_value - g_scanner_destroy - g_scanner_eof - g_scanner_error - g_scanner_freeze_symbol_table - g_scanner_get_next_token - g_scanner_input_file - g_scanner_input_text - g_scanner_lookup_symbol - g_scanner_new - g_scanner_peek_next_token - g_scanner_scope_add_symbol - g_scanner_scope_foreach_symbol - g_scanner_scope_lookup_symbol - g_scanner_scope_remove_symbol - g_scanner_set_scope - g_scanner_stat_mode - g_scanner_sync_file_offset - g_scanner_thaw_symbol_table - g_scanner_unexp_token - g_scanner_warn - g_set_error_handler - g_set_message_handler - g_set_prgname - g_set_print_handler - g_set_printerr_handler - g_set_warning_handler - g_slist_alloc - g_slist_append - g_slist_concat - g_slist_copy - g_slist_find - g_slist_find_custom - g_slist_foreach - g_slist_free - g_slist_free_1 - g_slist_index - g_slist_insert - g_slist_insert_sorted - g_slist_last - g_slist_length - g_slist_nth - g_slist_nth_data - g_slist_position - g_slist_prepend - g_slist_remove - g_slist_remove_link - g_slist_reverse - g_slist_sort - g_snprintf - g_source_add - g_source_remove - g_source_remove_by_source_data - g_source_remove_by_user_data - g_static_mutex_get_mutex_impl - g_static_private_get - g_static_private_set - g_str_equal - g_str_hash - g_strcasecmp - g_strconcat - g_strdelimit - g_strdown - g_strdup - g_strdup_printf - g_strdup_vprintf - g_strerror - g_strfreev - g_string_append - g_string_append_c - g_string_assign - g_string_chunk_free - g_string_chunk_insert - g_string_chunk_insert_const - g_string_chunk_new - g_string_down - g_string_erase - g_string_free - g_string_insert - g_string_insert_c - g_string_new - g_string_prepend - g_string_prepend_c - g_string_sized_new - g_string_sprintf - g_string_sprintfa - g_string_truncate - g_string_up - g_strjoinv - g_strescape - g_strndup - g_strnfill - g_strreverse - g_strsignal - g_strsplit - g_strtod - g_strup - g_timeout_add - g_timeout_add_full - g_timer_destroy - g_timer_elapsed - g_timer_new - g_timer_reset - g_timer_start - g_timer_stop - g_tree_destroy - g_tree_height - g_tree_insert - g_tree_lookup - g_tree_new - g_tree_nnodes - g_tree_remove - g_tree_search - g_tree_traverse - g_tuples_destroy - g_tuples_index - g_vsnprintf - glib_binary_age - glib_interface_age - glib_major_version - glib_micro_version - glib_minor_version - gwin_ftruncate - gwin_opendir - gwin_readdir - gwin_rewinddir - gwin_closedir diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in deleted file mode 100644 index 129cdcf34..000000000 --- a/glib/makefile.msc.in +++ /dev/null @@ -1,165 +0,0 @@ -## Makefile for building the GLib, gmodule and gthread dlls with Microsoft C -## Use: nmake -f makefile.msc install - -# Change this to wherever you want to install the DLLs. This directory -# should be in your PATH. -BIN = C:\bin - -# This is the location of pthreads for Win32, -# see http://sourceware.cygnus.com/pthreads-win32/ -# We want the 1999-04-07 snapshot. -PTHREADS = ..\pthreads-snap-1999-04-07 -PTHREAD_LIB = $(PTHREADS)\pthread.lib -PTHREAD_INC = -I$(PTHREADS) - -################################################################ - -# Nothing much configurable below - -# cl -? describes the options -CC = cl -G5 -GF -Ox -W3 -MD -nologo - -# No general LDFLAGS needed -LDFLAGS = /link -INSTALL = copy - -GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ - -CFLAGS = -I. -DHAVE_CONFIG_H - -all : \ - glibconfig.h \ - config.h \ - glib-$(GLIB_VER).dll \ - gmodule\gmoduleconf.h \ - gmodule-$(GLIB_VER).dll \ - gthread-$(GLIB_VER).dll \ - testglib.exe \ - testgmodule.exe \ - testgdate.exe \ - testgdateparser.exe \ - testgthread.exe - -install : all - $(INSTALL) glib-$(GLIB_VER).dll $(BIN) - $(INSTALL) gmodule-$(GLIB_VER).dll $(BIN) - $(INSTALL) gthread-$(GLIB_VER).dll $(BIN) - -glib_OBJECTS = \ - garray.obj \ - gcache.obj \ - gcompletion.obj \ - gdataset.obj \ - gdate.obj \ - gerror.obj \ - ghook.obj \ - ghash.obj \ - giochannel.obj \ - giowin32.obj \ - glist.obj \ - gmain.obj \ - gmem.obj \ - gmessages.obj \ - gmutex.obj \ - gnode.obj \ - gprimes.obj \ - gslist.obj \ - gtimer.obj \ - gtree.obj \ - grel.obj \ - gstring.obj \ - gstrfuncs.obj \ - gscanner.obj \ - gutils.obj - -glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def - $(CC) $(CFLAGS) -LD -Feglib-$(GLIB_VER).dll $(glib_OBJECTS) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:glib.def - -glibconfig.h: glibconfig.h.win32 - copy glibconfig.h.win32 glibconfig.h - -config.h: config.h.win32 - copy config.h.win32 config.h - -.c.obj : - $(CC) $(CFLAGS) -GD -c -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib $< - -gmodule_OBJECTS = \ - gmodule.obj - -gmodule-$(GLIB_VER).dll : $(gmodule_OBJECTS) - $(CC) $(CFLAGS) -LD -Fegmodule-$(GLIB_VER).dll $(gmodule_OBJECTS) glib-$(GLIB_VER).lib $(LDFLAGS) /def:gmodule\gmodule.def - -gmodule.obj : gmodule\gmodule.c gmodule\gmodule-win32.c - $(CC) $(CFLAGS) -GD -Igmodule -c -DG_LOG_DOMAIN=\"GModule\" gmodule\gmodule.c - -gmodule\gmoduleconf.h: gmodule\gmoduleconf.h.win32 - copy gmodule\gmoduleconf.h.win32 gmodule\gmoduleconf.h - -gthread_OBJECTS = \ - gthread.obj - -gthread-$(GLIB_VER).dll : $(gthread_OBJECTS) - $(CC) $(CFLAGS) -LD -Fegthread-$(GLIB_VER).dll $(gthread_OBJECTS) glib-$(GLIB_VER).lib $(PTHREAD_LIB) glib-$(GLIB_VER).lib $(LDFLAGS) /def:gthread\gthread.def - -gthread.obj : gthread\gthread.c gthread\gthread-posix.c - $(CC) $(CFLAGS) -GD $(PTHREAD_INC) -DG_LOG_DOMAIN=\"GThread\" -c gthread\gthread.c - -testglib.exe : glib-$(GLIB_VER).dll testglib.obj - $(CC) $(CFLAGS) -Fetestglib.exe testglib.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console - -testglib.obj : testglib.c - $(CC) -c $(CFLAGS) testglib.c - -testgdate.exe : glib-$(GLIB_VER).dll testgdate.obj - $(CC) $(CFLAGS) -Fetestgdate.exe testgdate.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console - -testgdate.obj : testgdate.c - $(CC) -c $(CFLAGS) testgdate.c - -testgdateparser.exe : glib-$(GLIB_VER).dll testgdateparser.obj - $(CC) $(CFLAGS) -Fetestgdateparser.exe testgdateparser.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console - -testgdateparser.obj : testgdateparser.c - $(CC) -c $(CFLAGS) testgdateparser.c - -testgmodule.exe : glib-$(GLIB_VER).dll gmodule-$(GLIB_VER).dll testgmodule.obj libgplugin_a.dll libgplugin_b.dll - $(CC) $(CFLAGS) testgmodule.obj glib-$(GLIB_VER).lib gmodule-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console - -testgmodule.obj : gmodule\testgmodule.c - $(CC) $(CFLAGS) -Igmodule -c gmodule\testgmodule.c - -libgplugin_a.dll : libgplugin_a.obj - $(CC) $(CFLAGS) -LD libgplugin_a.obj glib-$(GLIB_VER).lib gmodule-$(GLIB_VER).lib $(LDFLAGS) - -libgplugin_a.obj : gmodule\libgplugin_a.c - $(CC) $(CFLAGS) -Igmodule -c gmodule\libgplugin_a.c - -libgplugin_b.dll : libgplugin_b.obj - $(CC) $(CFLAGS) -LD libgplugin_b.obj glib-$(GLIB_VER).lib gmodule-$(GLIB_VER).lib $(LDFLAGS) - -libgplugin_b.obj : gmodule\libgplugin_b.c - $(CC) $(CFLAGS) -Igmodule -c gmodule\libgplugin_b.c - -testgthread.exe : glib-$(GLIB_VER).dll gthread-$(GLIB_VER).dll testgthread.obj - $(CC) $(CFLAGS) testgthread.obj glib-$(GLIB_VER).lib gthread-$(GLIB_VER).lib $(PTHREAD_LIB) $(LDFLAGS) /subsystem:console - -testgthread.obj : gthread\testgthread.c - $(CC) $(CFLAGS) $(PTHREAD_INC) -c gthread\testgthread.c - -clean: - del config.h - del glibconfig.h - del gmodule\gmoduleconf.h - del *.exe - del *.obj - del *.dll - del *.lib - del *.err - del *.map - del *.sym - del *.exp - del *.lk1 - del *.mk1 - del *.pdb - del *.ilk