a
/
nat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix up golint errors

This commit is contained in:
Eliot Whalan 2016-07-04 12:29:59 +10:00
parent 3e92d60ad1
commit 24bb024c18
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pastebin.go
View File

@ -1,4 +1,4 @@
// pastebin is a simple modern and powerful pastebin service // package pastebin is a simple modern and powerful pastebin service
package pastebin package pastebin
import ( import (
@ -33,7 +33,7 @@ const (
LENGTH = 6 LENGTH = 6
// PORT that pastebin will listen on // PORT that pastebin will listen on
PORT = ":9900" PORT = ":9900"
// USERNAME for databse // USERNAME for database
USERNAME = "" USERNAME = ""
// PASS database password // PASS database password
PASS = "" PASS = ""
@ -183,12 +183,9 @@ func delHandler(w http.ResponseWriter, r *http.Request) {
check(err) check(err)
_, err = res.RowsAffected() _, err = res.RowsAffected()
if err == sql.ErrNoRows { if err != sql.ErrNoRows {
io.WriteString(w, "Error invalid paste")
} else {
io.WriteString(w, id+" deleted") io.WriteString(w, id+" deleted")
} }
} }
// saveHandler // saveHandler
@ -276,17 +273,13 @@ func getPaste(paste string, lang string) (string, string) {
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
return "Error invalid paste", "" return "Error invalid paste", ""
} else {
if lang == "" {
return html.UnescapeString(s), html.UnescapeString(title)
} else {
high, err := highlight(s, lang)
check(err)
return high, html.UnescapeString(title)
}
} }
if lang != "" {
high, err := highlight(s, lang)
check(err)
return high, html.UnescapeString(title)
}
return html.UnescapeString(s), html.UnescapeString(title)
} }
var templates = template.Must(template.ParseFiles("assets/paste.html", "assets/index.html", "assets/clone.html")) var templates = template.Must(template.ParseFiles("assets/paste.html", "assets/index.html", "assets/clone.html"))