From 422a850354ec8a6c16ef3c0ba589c2f2965d91ca Mon Sep 17 00:00:00 2001
From: maru <maru@myyahoo.com>
Date: Wed, 10 Apr 2024 02:41:58 -0400
Subject: [PATCH] Move httpError func to generic.go

---
 api/error.go   | 11 -----------
 api/generic.go |  6 ++++++
 2 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 api/error.go

diff --git a/api/error.go b/api/error.go
deleted file mode 100644
index 2c60438..0000000
--- a/api/error.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package api
-
-import (
-	"log"
-	"net/http"
-)
-
-func httpError(w http.ResponseWriter, r *http.Request, err error, code int) {
-	log.Printf("%s: %s\n", r.URL.Path, err)
-	http.Error(w, err.Error(), code)
-}
diff --git a/api/generic.go b/api/generic.go
index 81af22e..05a9090 100644
--- a/api/generic.go
+++ b/api/generic.go
@@ -5,6 +5,7 @@ import (
 	"encoding/gob"
 	"encoding/json"
 	"fmt"
+	"log"
 	"net/http"
 	"strconv"
 
@@ -263,6 +264,11 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
+func httpError(w http.ResponseWriter, r *http.Request, err error, code int) {
+	log.Printf("%s: %s\n", r.URL.Path, err)
+	http.Error(w, err.Error(), code)
+}
+
 // auth
 
 type GenericAuthRequest struct {