From 358c96a8f5959cf093df6682d2d0b41f5e9bc9b8 Mon Sep 17 00:00:00 2001
From: Mark McGranaghan <mmcgrana@gmail.com>
Date: Tue, 9 Oct 2012 07:58:30 -0700
Subject: [PATCH] inline

---
 tool/generate.go | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/tool/generate.go b/tool/generate.go
index b426d0a..6f7c60f 100644
--- a/tool/generate.go
+++ b/tool/generate.go
@@ -31,7 +31,7 @@ func filterStrings(vs []string, f func(string) bool) []string {
     return vsf
 }
 
-func render(bin string, arg []string, src string) []byte {
+func pipe(bin string, arg []string, src string) []byte {
     cmd := exec.Command(bin, arg...)
     in, _ := cmd.StdinPipe()
     out, _ := cmd.StdoutPipe()
@@ -57,25 +57,20 @@ func mustReadFile(path string) string {
     return string(bytes)
 }
 
-func cachedRender(bin string, arg []string, src string) string {
+func cachedPygmentize(lex string, src string) string {
+    arg := []string{"-l", lex, "-f", "html"}
+    bin := "/usr/local/bin/pygmentize"
     cachePath := cacheDir + "/pygmentize-" + strings.Join(arg, "-") + "-" + sha1Sum(src)
     cacheBytes, cacheErr := ioutil.ReadFile(cachePath)
     if cacheErr == nil {
         return string(cacheBytes)
     }
-    renderBytes := render(bin, arg, src)
+    renderBytes := pipe(bin, arg, src)
     writeErr := ioutil.WriteFile(cachePath, renderBytes, 0600)
     check(writeErr)
     return string(renderBytes)
 }
 
-func cachedPygmentize(lex string, src string) string {
-    return cachedRender(
-        "/usr/local/bin/pygmentize",
-        []string{"-l", lex, "-f", "html"},
-        src)
-}
-
 func ensureCache() {
     mkdirErr := os.MkdirAll(cacheDir, 0700)
     check(mkdirErr)