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.
-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
EXTRA_DIST = \
@GLIB_DEBUG_FLAGS@ -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
EXTRA_DIST = \
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",
mem_chunk->name, mem, mem_chunk->num_mem_areas);
}
"%s: %ld bytes using %d mem areas",
mem_chunk->name, mem, mem_chunk->num_mem_areas);
}
}
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);
mem_chunk = mem_chunks;
g_mutex_lock (mem_chunks_lock);
mem_chunk = mem_chunks;
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 GLogLevelFlags g_log_always_fatal = G_LOG_FATAL_MASK;
static GPrintFunc glib_print_func = NULL;
static GLogDomain *g_log_domains = NULL;
static GLogLevelFlags g_log_always_fatal = G_LOG_FATAL_MASK;
static GPrintFunc glib_print_func = NULL;
-GLIB_VAR const gchar *g_log_domain_glib;
guint g_log_set_handler (const gchar *log_domain,
GLogLevelFlags log_levels,
GLogFunc log_func,
guint g_log_set_handler (const gchar *log_domain,
GLogLevelFlags log_levels,
GLogFunc log_func,
}
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);
}
GRelation* rel = (GRelation*) user_data;
GHashTable* table = (GHashTable*) tuple_value;
GRelation* rel = (GRelation*) user_data;
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_relation_print_one,
g_hash_table_foreach (table,
g_relation_print_one,
- 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_relation_print_one,
g_hash_table_foreach (relation->all_tuples,
g_relation_print_one,
if (relation->hashed_tuple_tables[i] == NULL)
continue;
if (relation->hashed_tuple_tables[i] == NULL)
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_relation_print_index,
g_hash_table_foreach (relation->hashed_tuple_tables[i],
g_relation_print_index,
balance = right_height - left_height;
if (balance != node->balance)
balance = right_height - left_height;
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",
balance, node->balance);
"g_tree_node_check: failed: %d ( %d )\n",
balance, node->balance);