X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fmain.c;h=24c8cefb03db2418cf842e2088353a38a2d30c31;hb=8ff0fd08d6e1cc97cdb7e94b7cd97dc28c29e674;hp=c02bc224c8e22a33ef2963002300bfb75704b98d;hpb=70fdd2326239a9a5e02b3c3699d2588d5fee48fa;p=bluesky.git

diff --git a/bluesky/main.c b/bluesky/main.c
index c02bc22..24c8cef 100644
--- a/bluesky/main.c
+++ b/bluesky/main.c
@@ -3,15 +3,38 @@
  * 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.
  */
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <inttypes.h>
 #include <stdint.h>
 #include <glib.h>
 
-#include "bluesky.h"
+#include "bluesky-private.h"
 
 /* Small test program for BlueSkyFS.  Doesn't do much useful. */
 
@@ -21,7 +44,7 @@ int main(int argc, char *argv[])
 
     printf("BlueSkyFS starting...\n");
 
-    printf("  time = %lld\n", bluesky_get_current_time());
+    printf("  time = %"PRIi64"\n", bluesky_get_current_time());
 
     BlueSkyFS *fs = bluesky_new_fs("export");