Cleaner fix part 1

[bluesky.git] / bluesky / util.c

diff --git a/bluesky/util.c b/bluesky/util.c
index bf1d09e..3652d1a 100644 (file)
--- a/bluesky/util.c
+++ b/bluesky/util.c
@@ -83,6 +83,7 @@ BlueSkyRCStr *bluesky_string_new_from_mmap(BlueSkyCacheFile *mmap,
                                            int offset, gsize len)
 {
     g_assert(offset + len <= mmap->len);
+    g_assert(mmap->addr != NULL);
 
     BlueSkyRCStr *string = g_new(BlueSkyRCStr, 1);
     string->mmap = mmap;
@@ -352,6 +353,8 @@ typedef struct {
 /* To catch attempts to access to invalid profile structures. */
 #define PROFILE_MAGIC 0x439929d8
 
+static FILE *profiling_file = NULL;
+
 BlueSkyProfile *bluesky_profile_new()
 {
     BlueSkyProfile *profile = g_new0(BlueSkyProfile, 1);
@@ -380,6 +383,9 @@ void bluesky_profile_free(BlueSkyProfile *profile)
 
 void bluesky_profile_add_event(BlueSkyProfile *profile, char *message)
 {
+    if (profiling_file == NULL)
+        return;
+
     g_return_if_fail(profile != NULL);
 
     if (profile->magic != PROFILE_MAGIC) {
@@ -396,7 +402,6 @@ void bluesky_profile_add_event(BlueSkyProfile *profile, char *message)
     g_mutex_unlock(profile->lock);
 }
 
-static FILE *profiling_file = NULL;
 static GStaticMutex profiling_print_lock = G_STATIC_MUTEX_INIT;
 
 void bluesky_profile_set_output(FILE *stream)
@@ -406,9 +411,9 @@ void bluesky_profile_set_output(FILE *stream)
 
 void bluesky_profile_print(BlueSkyProfile *profile)
 {
-    if (profiling_file == NULL)
-        return;
     FILE *stream = profiling_file;
+    if (stream == NULL)
+        return;
 
     g_return_if_fail(profile != NULL);