static correctness

2001-11-03  Hans Breuer  <hans@breuer.org>

	* glib/giowin32.c : static correctness

	* glib/gwin32.c : some more #if defined (SUBLANG_* ...
	(g_win32_get_package_installation_subdirectory) use g_build_filename
	instead of duplicating its logic

	* glib/glib.def : removed duplicates, added mising, removed
	compat cruft

diff --git a/ChangeLog b/ChangeLog
index 526456d..2e0bb43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-11-03  Hans Breuer  <hans@breuer.org>
+
+       * glib/giowin32.c : static correctness
+
+       * glib/gwin32.c : some more #if defined (SUBLANG_* ...
+       (g_win32_get_package_installation_subdirectory) use g_build_filename
+       instead of duplicating its logic
+
+       * glib/glib.def : removed duplicates, added mising, removed
+       compat cruft
+
 Fri Nov  2 19:54:16 2001  Tim Janik  <timj@gtk.org>
 
        * glib/gbacktrace.h (G_BREAKPOINT): remove public signal.h include.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 526456d..2e0bb43 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,14 @@
+2001-11-03  Hans Breuer  <hans@breuer.org>
+
+       * glib/giowin32.c : static correctness
+
+       * glib/gwin32.c : some more #if defined (SUBLANG_* ...
+       (g_win32_get_package_installation_subdirectory) use g_build_filename
+       instead of duplicating its logic
+
+       * glib/glib.def : removed duplicates, added mising, removed
+       compat cruft
+
 Fri Nov  2 19:54:16 2001  Tim Janik  <timj@gtk.org>
 
        * glib/gbacktrace.h (G_BREAKPOINT): remove public signal.h include.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 526456d..2e0bb43 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+2001-11-03  Hans Breuer  <hans@breuer.org>
+
+       * glib/giowin32.c : static correctness
+
+       * glib/gwin32.c : some more #if defined (SUBLANG_* ...
+       (g_win32_get_package_installation_subdirectory) use g_build_filename
+       instead of duplicating its logic
+
+       * glib/glib.def : removed duplicates, added mising, removed
+       compat cruft
+
 Fri Nov  2 19:54:16 2001  Tim Janik  <timj@gtk.org>
 
        * glib/gbacktrace.h (G_BREAKPOINT): remove public signal.h include.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 526456d..2e0bb43 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,14 @@
+2001-11-03  Hans Breuer  <hans@breuer.org>
+
+       * glib/giowin32.c : static correctness
+
+       * glib/gwin32.c : some more #if defined (SUBLANG_* ...
+       (g_win32_get_package_installation_subdirectory) use g_build_filename
+       instead of duplicating its logic
+
+       * glib/glib.def : removed duplicates, added mising, removed
+       compat cruft
+
 Fri Nov  2 19:54:16 2001  Tim Janik  <timj@gtk.org>
 
        * glib/gbacktrace.h (G_BREAKPOINT): remove public signal.h include.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 526456d..2e0bb43 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+2001-11-03  Hans Breuer  <hans@breuer.org>
+
+       * glib/giowin32.c : static correctness
+
+       * glib/gwin32.c : some more #if defined (SUBLANG_* ...
+       (g_win32_get_package_installation_subdirectory) use g_build_filename
+       instead of duplicating its logic
+
+       * glib/glib.def : removed duplicates, added mising, removed
+       compat cruft
+
 Fri Nov  2 19:54:16 2001  Tim Janik  <timj@gtk.org>
 
        * glib/gbacktrace.h (G_BREAKPOINT): remove public signal.h include.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 526456d..2e0bb43 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+2001-11-03  Hans Breuer  <hans@breuer.org>
+
+       * glib/giowin32.c : static correctness
+
+       * glib/gwin32.c : some more #if defined (SUBLANG_* ...
+       (g_win32_get_package_installation_subdirectory) use g_build_filename
+       instead of duplicating its logic
+
+       * glib/glib.def : removed duplicates, added mising, removed
+       compat cruft
+
 Fri Nov  2 19:54:16 2001  Tim Janik  <timj@gtk.org>
 
        * glib/gbacktrace.h (G_BREAKPOINT): remove public signal.h include.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 526456d..2e0bb43 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+2001-11-03  Hans Breuer  <hans@breuer.org>
+
+       * glib/giowin32.c : static correctness
+
+       * glib/gwin32.c : some more #if defined (SUBLANG_* ...
+       (g_win32_get_package_installation_subdirectory) use g_build_filename
+       instead of duplicating its logic
+
+       * glib/glib.def : removed duplicates, added mising, removed
+       compat cruft
+
 Fri Nov  2 19:54:16 2001  Tim Janik  <timj@gtk.org>
 
        * glib/gbacktrace.h (G_BREAKPOINT): remove public signal.h include.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 526456d..2e0bb43 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+2001-11-03  Hans Breuer  <hans@breuer.org>
+
+       * glib/giowin32.c : static correctness
+
+       * glib/gwin32.c : some more #if defined (SUBLANG_* ...
+       (g_win32_get_package_installation_subdirectory) use g_build_filename
+       instead of duplicating its logic
+
+       * glib/glib.def : removed duplicates, added mising, removed
+       compat cruft
+
 Fri Nov  2 19:54:16 2001  Tim Janik  <timj@gtk.org>
 
        * glib/gbacktrace.h (G_BREAKPOINT): remove public signal.h include.

diff --git a/glib/giowin32.c b/glib/giowin32.c
index 55de7fe..5f57002 100644 (file)
--- a/glib/giowin32.c
+++ b/glib/giowin32.c
@@ -1257,7 +1257,7 @@ g_io_channel_new_file (const gchar  *filename,
   return channel;
 }
 
-GIOStatus
+static GIOStatus
 g_io_win32_set_flags (GIOChannel     *channel,
                       GIOFlags        flags,
                       GError        **err)
@@ -1278,7 +1278,7 @@ g_io_win32_set_flags (GIOChannel     *channel,
   return G_IO_STATUS_ERROR;
 }
 
-GIOFlags
+static GIOFlags
 g_io_win32_fd_get_flags (GIOChannel     *channel)
 {
   GIOFlags flags = 0;
@@ -1304,7 +1304,7 @@ g_io_win32_fd_get_flags (GIOChannel     *channel)
 /*
  * Generic implementation, just translating createion flags
  */
-GIOFlags
+static GIOFlags
 g_io_win32_get_flags (GIOChannel     *channel)
 {
   GIOFlags flags;

diff --git a/glib/glib.def b/glib/glib.def
index cb98b41..cab33c0 100644 (file)
--- a/glib/glib.def
+++ b/glib/glib.def
@@ -14,9 +14,10 @@ EXPORTS
        g_array_sort_with_data
        g_ascii_digit_value
        g_ascii_dtostr
+       g_ascii_formatd
        g_ascii_strcasecmp
-       g_ascii_strncasecmp
        g_ascii_strdown
+       g_ascii_strncasecmp
        g_ascii_strtod
        g_ascii_strup
        g_ascii_table
@@ -49,6 +50,7 @@ EXPORTS
        g_bsearch_array_destroy
        g_bsearch_array_get_index
        g_bsearch_array_get_nth
+       g_bsearch_array_insert
        g_bsearch_array_new
        g_bsearch_array_insert
        g_bsearch_array_lookup
@@ -82,6 +84,7 @@ EXPORTS
        g_convert
        g_convert_error_quark
        g_convert_with_fallback
+       g_convert_with_iconv
        g_datalist_clear
        g_datalist_foreach
        g_datalist_id_get_data
@@ -96,8 +99,10 @@ EXPORTS
        g_date_add_days
        g_date_add_months
        g_date_add_years
+       g_date_clamp
        g_date_clear
        g_date_compare
+       g_date_days_between
        g_date_free
        g_date_get_day
        g_date_get_day_of_year
@@ -116,6 +121,7 @@ EXPORTS
        g_date_new
        g_date_new_dmy
        g_date_new_julian
+       g_date_order
        g_date_set_day
        g_date_set_dmy
        g_date_set_julian
@@ -166,13 +172,16 @@ EXPORTS
        g_hash_table_destroy
        g_hash_table_foreach
        g_hash_table_foreach_remove
+       g_hash_table_foreach_steal
        g_hash_table_insert
        g_hash_table_lookup
        g_hash_table_lookup_extended
        g_hash_table_new
        g_hash_table_new_full
        g_hash_table_remove
+       g_hash_table_replace
        g_hash_table_size
+       g_hash_table_steal
        g_hook_alloc
        g_hook_compare_ids
        g_hook_destroy
@@ -236,6 +245,7 @@ EXPORTS
        g_io_channel_set_encoding
        g_io_channel_set_flags
        g_io_channel_set_line_term
+       g_io_channel_shutdown
        g_io_channel_unix_get_fd
        g_io_channel_unix_new
        g_io_channel_unref
@@ -271,6 +281,8 @@ EXPORTS
        g_list_length
        g_list_nth
        g_list_nth_data
+       g_list_nth_prev
+       g_list_pop_allocator
        g_list_position
        g_list_prepend
        g_list_remove
@@ -289,6 +301,7 @@ EXPORTS
        g_log_set_fatal_mask
        g_log_set_handler
        g_logv
+       g_main_context_acquire
        g_main_context_add_poll
        g_main_context_check
        g_main_context_default
@@ -296,14 +309,20 @@ EXPORTS
        g_main_context_find_source_by_funcs_user_data
        g_main_context_find_source_by_id
        g_main_context_find_source_by_user_data
-       g_main_context_new
        g_main_context_get_poll_func
        g_main_context_iteration
+       g_main_context_new
        g_main_context_pending
        g_main_context_prepare
        g_main_context_query
+       g_main_context_ref
+       g_main_context_release
        g_main_context_remove_poll
        g_main_context_set_poll_func
+       g_main_context_unref
+       g_main_context_wait
+       g_main_context_wakeup
+       g_main_loop_get_context
        g_main_loop_is_running
        g_main_loop_new
        g_main_loop_quit
@@ -329,6 +348,7 @@ EXPORTS
        g_mem_chunk_print
        g_mem_chunk_reset
        g_mem_init
+       g_mem_is_system_malloc
        g_mem_profile
        g_mem_set_vtable
        g_memdup
@@ -356,7 +376,9 @@ EXPORTS
        g_node_n_nodes
        g_node_new
        g_node_nth_child
+       g_node_pop_allocator
        g_node_prepend
+       g_node_push_allocator
        g_node_reverse_children
        g_node_traverse
        g_node_unlink
@@ -477,8 +499,10 @@ EXPORTS
        g_slist_length
        g_slist_nth
        g_slist_nth_data
+       g_slist_pop_allocator
        g_slist_position
        g_slist_prepend
+       g_slist_push_allocator
        g_slist_remove
        g_slist_remove_all
        g_slist_remove_link
@@ -499,6 +523,7 @@ EXPORTS
        g_source_remove
        g_source_remove_by_funcs_user_data
        g_source_remove_by_user_data
+       g_source_remove_poll
        g_source_set_callback
        g_source_set_callback_indirect
        g_source_set_can_recurse
@@ -511,7 +536,9 @@ EXPORTS
        g_spawn_command_line_sync
        g_spawn_error_quark
        g_spawn_sync
+       g_static_mutex_free
        g_static_mutex_get_mutex_impl
+       g_static_mutex_init
        g_static_private_free
        g_static_private_get
        g_static_private_init
@@ -519,8 +546,10 @@ EXPORTS
        g_static_rec_mutex_free
        g_static_rec_mutex_init
        g_static_rec_mutex_lock
+       g_static_rec_mutex_lock_full
        g_static_rec_mutex_trylock
        g_static_rec_mutex_unlock
+       g_static_rec_mutex_unlock_full
        g_static_rw_lock_free
        g_static_rw_lock_init
        g_static_rw_lock_reader_lock
@@ -553,6 +582,7 @@ EXPORTS
        g_string_append_printf
        g_string_append_unichar
        g_string_ascii_down
+       g_string_ascii_up
        g_string_assign
        g_string_chunk_free
        g_string_chunk_insert
@@ -562,6 +592,7 @@ EXPORTS
        g_string_equal
        g_string_erase
        g_string_free
+       g_string_hash
        g_string_insert
        g_string_insert_c
        g_string_insert_len
@@ -573,6 +604,7 @@ EXPORTS
        g_string_prepend_len
        g_string_prepend_unichar
        g_string_printf
+       g_string_set_size
        g_string_sized_new
        g_string_truncate
        g_string_up
@@ -584,25 +616,33 @@ EXPORTS
        g_strndup
        g_strnfill
        g_strreverse
-       g_strsignal
-       g_strsplit
        g_strrstr
        g_strrstr_len
+       g_strsignal
+       g_strsplit
        g_strstr_len
        g_strtod
        g_strup
        g_thread_create_full
        g_thread_error_quark
+       g_thread_exit
        g_thread_functions_for_glib_use
        g_thread_join
        g_thread_exit
        g_thread_pool_free
+       g_thread_pool_get_max_threads
+       g_thread_pool_get_max_unused_threads
+       g_thread_pool_get_num_threads
        g_thread_pool_new
        g_thread_pool_push
+       g_thread_pool_set_max_threads
+       g_thread_pool_set_max_unused_threads
+       g_thread_pool_unprocessed
        g_thread_self
        g_thread_set_priority
        g_thread_use_default_impl
        g_threads_got_initialized
+       g_time_val_add
        g_timeout_add
        g_timeout_add_full
        g_timeout_funcs
@@ -618,13 +658,19 @@ EXPORTS
        g_trash_stack_pop
        g_trash_stack_push
        g_tree_destroy
+       g_tree_foreach
        g_tree_height
        g_tree_insert
        g_tree_lookup
+       g_tree_lookup_extended
        g_tree_new
+       g_tree_new_full
+       g_tree_new_with_data
        g_tree_nnodes
        g_tree_remove
+       g_tree_replace
        g_tree_search
+       g_tree_steal
        g_tree_traverse
        g_try_malloc
        g_try_realloc
@@ -676,6 +722,7 @@ EXPORTS
        g_utf8_strdown
        g_utf8_strlen
        g_utf8_strncpy
+       g_utf8_strrchr
        g_utf8_strup
        g_utf8_to_ucs4
        g_utf8_to_ucs4_fast
@@ -693,11 +740,3 @@ EXPORTS
        glib_mem_profiler_table
        glib_micro_version
        glib_minor_version
-
-; compatibility for older win32 apps, which should
-; not need an update because of simple function renaming
-; and vice versa, i.e.:
-; compatibility of Dia 0.87 with tml's latest Gtk+ version (2000-12-26)
-       g_dirname=g_path_get_dirname
-       g_string_sprintfa=g_string_append_printf
-       g_string_sprintf=g_string_printf

diff --git a/glib/gwin32.c b/glib/gwin32.c
index e023fe7..79924aa 100644 (file)
--- a/glib/gwin32.c
+++ b/glib/gwin32.c
@@ -278,12 +278,14 @@ g_win32_getlocale (void)
     case LANG_ASSAMESE: l = "as"; sl = "IN"; break;
     case LANG_AZERI:
       l = "az";
+#if defined (SUBLANG_AZERI_LATIN) && defined (SUBLANG_AZERI_CYRILLIC)
       switch (sub)
        {
        /* FIXME: Adjust this when Azerbaijani locales appear on Unix.  */
        case SUBLANG_AZERI_LATIN: sl = "@latin"; break;
        case SUBLANG_AZERI_CYRILLIC: sl = "@cyrillic"; break;
        }
+#endif
       break;
     case LANG_BASQUE:
       l = "eu"; /* sl could be "ES" or "FR".  */
@@ -414,7 +416,9 @@ g_win32_getlocale (void)
       l = "ms";
       switch (sub)
        {
+#ifdef SUBLANG_MALAY_MALAYSIA
        case SUBLANG_MALAY_MALAYSIA: sl = "MY"; break;
+#endif
        case SUBLANG_MALAY_BRUNEI_DARUSSALAM: sl = "BN"; break;
        }
       break;
@@ -522,7 +526,9 @@ g_win32_getlocale (void)
       switch (sub)
        {
        /* FIXME: Adjust this when Uzbek locales appear on Unix.  */
+#ifdef SUBLANG_UZBEK_LATIN
        case SUBLANG_UZBEK_LATIN: sl = "UZ@latin"; break;
+#endif
        case SUBLANG_UZBEK_CYRILLIC: sl = "UZ@cyrillic"; break;
        }
       break;
@@ -767,16 +773,8 @@ g_win32_get_package_installation_subdirectory (gchar *package,
                                               gchar *subdir)
 {
   gchar *prefix;
-  gchar *sep;
 
   prefix = g_win32_get_package_installation_directory (package, dll_name);
 
-  if (subdir == NULL)
-    subdir = "";
-
-  sep = (subdir[0] == '\0' ||
-        prefix[strlen (prefix) - 1] == G_DIR_SEPARATOR) ?
-    "" : G_DIR_SEPARATOR_S;
-
-  return g_strconcat (prefix, sep, subdir, NULL);
+  return g_build_filename (prefix, subdir, NULL);
 }