luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-05-12 08:53:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Get rid fo g_log_domain_glib variable in favor of just using a string

Browse Source 
Sat Nov 17 17:21:57 2001  Owen Taylor  <otaylor@redhat.com>

        * glib/Makefile.am glib/*.c glib/gmessages.h: Get
        rid fo g_log_domain_glib variable in favor of just
        using a string constant.
This commit is contained in:
Owen Taylor 2001-11-17 23:23:01 +00:00 committed by Owen Taylor
parent 31be0476a4
commit f1019c04fc
6 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glib/Makefile.am
View File

@ -2,7 +2,7 @@
SUBDIRS=libcharset SUBDIRS=libcharset
INCLUDES = -I$(top_srcdir) -DG_LOG_DOMAIN=g_log_domain_glib \ INCLUDES = -I$(top_srcdir) -DG_LOG_DOMAIN=\"GLib\" \
@GLIB_DEBUG_FLAGS@ -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION @GLIB_DEBUG_FLAGS@ -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
EXTRA_DIST = \ EXTRA_DIST = \

4
glib/gmem.c
View File

@ -1044,7 +1044,7 @@ g_mem_chunk_print (GMemChunk *mem_chunk)
mem_areas = mem_areas->next; mem_areas = mem_areas->next;
} }
g_log (g_log_domain_glib, G_LOG_LEVEL_INFO, g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO,
"%s: %ld bytes using %d mem areas", "%s: %ld bytes using %d mem areas",
mem_chunk->name, mem, mem_chunk->num_mem_areas); mem_chunk->name, mem, mem_chunk->num_mem_areas);
} }
@ -1065,7 +1065,7 @@ g_mem_chunk_info (void)
} }
g_mutex_unlock (mem_chunks_lock); g_mutex_unlock (mem_chunks_lock);
g_log (g_log_domain_glib, G_LOG_LEVEL_INFO, "%d mem chunks", count); g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "%d mem chunks", count);
g_mutex_lock (mem_chunks_lock); g_mutex_lock (mem_chunks_lock);
mem_chunk = mem_chunks; mem_chunk = mem_chunks;

1
glib/gmessages.c
View File

@ -80,7 +80,6 @@ static gsize printf_string_upper_bound (const gchar *format,
static GMutex* g_messages_lock = NULL; static GMutex* g_messages_lock = NULL;
const gchar *g_log_domain_glib = "GLib";
static GLogDomain *g_log_domains = NULL; static GLogDomain *g_log_domains = NULL;
static GLogLevelFlags g_log_always_fatal = G_LOG_FATAL_MASK; static GLogLevelFlags g_log_always_fatal = G_LOG_FATAL_MASK;
static GPrintFunc glib_print_func = NULL; static GPrintFunc glib_print_func = NULL;

1
glib/gmessages.h
View File

@ -71,7 +71,6 @@ typedef void (*GLogFunc) (const gchar *log_domain,
/* Logging mechanism /* Logging mechanism
*/ */
GLIB_VAR const gchar *g_log_domain_glib;
guint g_log_set_handler (const gchar *log_domain, guint g_log_set_handler (const gchar *log_domain,
GLogLevelFlags log_levels, GLogLevelFlags log_levels,
GLogFunc log_func, GLogFunc log_func,

8
glib/grel.c
View File

@ -404,7 +404,7 @@ g_relation_print_one (gpointer tuple_key,
} }
g_string_append (gstring, "]"); g_string_append (gstring, "]");
g_log (g_log_domain_glib, G_LOG_LEVEL_INFO, gstring->str); g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, gstring->str);
g_string_free (gstring, TRUE); g_string_free (gstring, TRUE);
} }
@ -416,7 +416,7 @@ g_relation_print_index (gpointer tuple_key,
GRelation* rel = (GRelation*) user_data; GRelation* rel = (GRelation*) user_data;
GHashTable* table = (GHashTable*) tuple_value; GHashTable* table = (GHashTable*) tuple_value;
g_log (g_log_domain_glib, G_LOG_LEVEL_INFO, "*** key %p", tuple_key); g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "*** key %p", tuple_key);
g_hash_table_foreach (table, g_hash_table_foreach (table,
g_relation_print_one, g_relation_print_one,
@ -428,7 +428,7 @@ g_relation_print (GRelation *relation)
{ {
gint i; gint i;
g_log (g_log_domain_glib, G_LOG_LEVEL_INFO, "*** all tuples (%d)", relation->count); g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "*** all tuples (%d)", relation->count);
g_hash_table_foreach (relation->all_tuples, g_hash_table_foreach (relation->all_tuples,
g_relation_print_one, g_relation_print_one,
@ -439,7 +439,7 @@ g_relation_print (GRelation *relation)
if (relation->hashed_tuple_tables[i] == NULL) if (relation->hashed_tuple_tables[i] == NULL)
continue; continue;
g_log (g_log_domain_glib, G_LOG_LEVEL_INFO, "*** index %d", i); g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "*** index %d", i);
g_hash_table_foreach (relation->hashed_tuple_tables[i], g_hash_table_foreach (relation->hashed_tuple_tables[i],
g_relation_print_index, g_relation_print_index,

2
glib/gtree.c
View File

@ -1054,7 +1054,7 @@ g_tree_node_check (GTreeNode *node)
balance = right_height - left_height; balance = right_height - left_height;
if (balance != node->balance) if (balance != node->balance)
g_log (g_log_domain_glib, G_LOG_LEVEL_INFO, g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO,
"g_tree_node_check: failed: %d ( %d )\n", "g_tree_node_check: failed: %d ( %d )\n",
balance, node->balance); balance, node->balance);