From 84e5af9fc2fb7c5bcab55cb777587d0fa46bd791 Mon Sep 17 00:00:00 2001
From: Vincent Batts <vbatts@redhat.com>
Date: Wed, 13 Feb 2013 16:42:30 -0500
Subject: [PATCH] my rand helper wasn't helping

---
 db_fileutil.go | 3 ++-
 hash.go        | 5 -----
 server.go      | 7 ++++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/db_fileutil.go b/db_fileutil.go
index 9399aae..eb7ac1c 100644
--- a/db_fileutil.go
+++ b/db_fileutil.go
@@ -3,6 +3,7 @@ package main
 
 import (
   "labix.org/v2/mgo/bson"
+  "math/rand"
 )
 
 /* gfs is a *mgo.GridFS defined in imgsrv.go */
@@ -16,7 +17,7 @@ func GetFileByFilename(filename string) (this_file File, err error) {
 }
 
 func GetFileRandom() (this_file File, err error) {
-  r := Rand64()
+  r := rand.Int63()
   err = gfs.Find(bson.M{"random": bson.M{"$gt" : r } }).One(&this_file)
   if (err != nil) {
     return this_file, err
diff --git a/hash.go b/hash.go
index 03c6350..5ff5eb7 100644
--- a/hash.go
+++ b/hash.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-  "math/rand"
   "crypto/md5"
   "fmt"
   "hash/adler32"
@@ -9,10 +8,6 @@ import (
   "time"
 )
 
-func Rand64() int64 {
-  return rand.Int63()
-}
-
 /* Convinience method for getting md5 sum of a string */
 func GetMd5FromString(blob string) (sum []byte) {
   h := md5.New()
diff --git a/server.go b/server.go
index 34215d1..974f965 100644
--- a/server.go
+++ b/server.go
@@ -6,6 +6,7 @@ import (
   "labix.org/v2/mgo"
   "labix.org/v2/mgo/bson"
   "log"
+  "math/rand"
   "mime"
   "net/http"
   "os"
@@ -142,7 +143,7 @@ func routeFilesPOST(w http.ResponseWriter, r *http.Request) {
   var filename string
   info := Info{
     Ip: r.RemoteAddr,
-    Random: Rand64(),
+    Random: rand.Int63(),
     TimeStamp: time.Now(),
   }
 
@@ -433,7 +434,7 @@ func routeGetFromUrl(w http.ResponseWriter, r *http.Request) {
   if (r.Method == "POST") {
     info := Info{
       Ip: r.RemoteAddr,
-      Random: Rand64(),
+      Random: rand.Int63(),
       TimeStamp: time.Now(),
     }
     log.Println(info)
@@ -512,7 +513,7 @@ func routeUpload(w http.ResponseWriter, r *http.Request) {
   if (r.Method == "POST") {
     info := Info{
       Ip: r.RemoteAddr,
-      Random: Rand64(),
+      Random: rand.Int63(),
       TimeStamp: time.Now(),
     }