X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Futil.c;h=5412963cefc31efd18f84ab18ad7d27d8e0a662a;hb=8ff0fd08d6e1cc97cdb7e94b7cd97dc28c29e674;hp=3898c4a189ac41fffe044b9c652b24a350b8d06f;hpb=bd90d0eef074977b2cd633d4fc9c482ccac2734d;p=bluesky.git

diff --git a/bluesky/util.c b/bluesky/util.c
index 3898c4a..5412963 100644
--- a/bluesky/util.c
+++ b/bluesky/util.c
@@ -3,7 +3,29 @@
  * Copyright (C) 2009  The Regents of the University of California
  * Written by Michael Vrable <mvrable@cs.ucsd.edu>
  *
- * TODO: Licensing
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 
 #define _GNU_SOURCE
@@ -353,6 +375,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);
@@ -381,6 +405,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) {
@@ -397,7 +424,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)
@@ -407,9 +433,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);