aboutsummaryrefslogtreecommitdiff
path: root/lib/http
diff options
context:
space:
mode:
authorShulhan <ms@kilabit.info>2018-12-16 17:29:23 +0700
committerShulhan <ms@kilabit.info>2018-12-16 17:30:46 +0700
commita0ae080cd4c79bf4a10b9f0fa98479c33e58aaf8 (patch)
tree3e3177fb382a400376d09b1dddb4c6d84e99b3f9 /lib/http
parent9b5ea5a879dd24d7fefaaa95511cde62ab3507fc (diff)
downloadpakakeh.go-a0ae080cd4c79bf4a10b9f0fa98479c33e58aaf8.tar.xz
lib/http: rename "path" variable to minimize conflict with package name
Diffstat (limited to 'lib/http')
-rw-r--r--lib/http/server.go36
1 files changed, 18 insertions, 18 deletions
diff --git a/lib/http/server.go b/lib/http/server.go
index f6e7c405..e1173541 100644
--- a/lib/http/server.go
+++ b/lib/http/server.go
@@ -82,45 +82,45 @@ func NewServer(root string, conn *http.Server) (srv *Server, e error) {
// RegisterDelete register HTTP method DELETE with callback to handle it.
//
func (srv *Server) RegisterDelete(
- path string, resType ResponseType, cb Callback,
+ reqPath string, resType ResponseType, cb Callback,
) {
- srv.register(path, RequestMethodDelete, RequestTypeQuery, resType, cb)
+ srv.register(reqPath, RequestMethodDelete, RequestTypeQuery, resType, cb)
}
//
// RegisterGet register HTTP method GET with callback to handle it.
//
func (srv *Server) RegisterGet(
- path string, resType ResponseType, cb Callback,
+ reqPath string, resType ResponseType, cb Callback,
) {
- srv.register(path, RequestMethodGet, RequestTypeQuery, resType, cb)
+ srv.register(reqPath, RequestMethodGet, RequestTypeQuery, resType, cb)
}
//
// RegisterPatch register HTTP method PATCH with callback to handle it.
//
func (srv *Server) RegisterPatch(
- path string, reqType RequestType, resType ResponseType, cb Callback,
+ reqPath string, reqType RequestType, resType ResponseType, cb Callback,
) {
- srv.register(path, RequestMethodPatch, reqType, resType, cb)
+ srv.register(reqPath, RequestMethodPatch, reqType, resType, cb)
}
//
// RegisterPost register HTTP method POST with callback to handle it.
//
func (srv *Server) RegisterPost(
- path string, reqType RequestType, resType ResponseType, cb Callback,
+ reqPath string, reqType RequestType, resType ResponseType, cb Callback,
) {
- srv.register(path, RequestMethodPost, reqType, resType, cb)
+ srv.register(reqPath, RequestMethodPost, reqType, resType, cb)
}
//
// RegisterPut register HTTP method PUT with callback to handle it.
//
func (srv *Server) RegisterPut(
- path string, reqType RequestType, cb Callback,
+ reqPath string, reqType RequestType, cb Callback,
) {
- srv.register(path, RequestMethodPut, reqType, ResponseTypeNone, cb)
+ srv.register(reqPath, RequestMethodPut, reqType, ResponseTypeNone, cb)
}
//
@@ -322,14 +322,14 @@ func (srv *Server) handleOptions(res http.ResponseWriter, req *http.Request) {
// register new handler with specific method, path, request type, and response
// type.
//
-func (srv *Server) register(path string, reqMethod RequestMethod,
+func (srv *Server) register(reqPath string, reqMethod RequestMethod,
reqType RequestType, resType ResponseType, cb Callback,
) {
if cb == nil {
return
}
- if len(path) == 0 {
- path = "/"
+ if len(reqPath) == 0 {
+ reqPath = "/"
}
handler := &handler{
@@ -340,14 +340,14 @@ func (srv *Server) register(path string, reqMethod RequestMethod,
switch reqMethod {
case RequestMethodDelete:
- srv.regDelete[path] = handler
+ srv.regDelete[reqPath] = handler
case RequestMethodGet:
- srv.regGet[path] = handler
+ srv.regGet[reqPath] = handler
case RequestMethodPatch:
- srv.regPatch[path] = handler
+ srv.regPatch[reqPath] = handler
case RequestMethodPost:
- srv.regPost[path] = handler
+ srv.regPost[reqPath] = handler
case RequestMethodPut:
- srv.regPut[path] = handler
+ srv.regPut[reqPath] = handler
}
}