diff options
| -rw-r--r-- | git2d/cmd1.c | 2 | ||||
| -rw-r--r-- | git2d/cmd2.c | 2 | ||||
| -rw-r--r-- | git2d/session.c | 4 | ||||
| -rw-r--r-- | git2d/x.h | 4 | ||||
| -rw-r--r-- | internal/git2c/cmd_index.go (renamed from internal/git2c/cmd1.go) | 2 | ||||
| -rw-r--r-- | internal/git2c/cmd_treeraw.go (renamed from internal/git2c/cmd2.go) | 2 | ||||
| -rw-r--r-- | internal/unsorted/http_handle_repo_index.go | 2 | ||||
| -rw-r--r-- | internal/unsorted/http_handle_repo_raw.go | 2 | ||||
| -rw-r--r-- | internal/unsorted/http_handle_repo_tree.go | 2 |
9 files changed, 11 insertions, 11 deletions
diff --git a/git2d/cmd1.c b/git2d/cmd1.c index d84d270..5d1988d 100644 --- a/git2d/cmd1.c +++ b/git2d/cmd1.c @@ -6,7 +6,7 @@ #include "x.h" int -cmd1(git_repository *repo, struct bare_writer *writer) +cmd_index(git_repository *repo, struct bare_writer *writer) { /* HEAD tree */ git_object *obj = NULL; diff --git a/git2d/cmd2.c b/git2d/cmd2.c index 6edacf2..7201a82 100644 --- a/git2d/cmd2.c +++ b/git2d/cmd2.c @@ -6,7 +6,7 @@ #include "x.h" int -cmd2(git_repository *repo, struct bare_reader *reader, struct bare_writer *writer) +cmd_treeraw(git_repository *repo, struct bare_reader *reader, struct bare_writer *writer) { /* Path */ char path[4096] = {0}; diff --git a/git2d/session.c b/git2d/session.c index 5efd218..23131ea 100644 --- a/git2d/session.c +++ b/git2d/session.c @@ -48,12 +48,12 @@ session(void *_conn) } switch (cmd) { case 1: - err = cmd1(repo, &writer); + err = cmd_index(repo, &writer); if (err != 0) goto free_repo; break; case 2: - err = cmd2(repo, &reader, &writer); + err = cmd_treeraw(repo, &reader, &writer); if (err != 0) goto free_repo; break; @@ -32,7 +32,7 @@ bare_error conn_write(void *buffer, const void *src, uint64_t sz); void * session(void *_conn); -int cmd1(git_repository *repo, struct bare_writer *writer); -int cmd2(git_repository *repo, struct bare_reader *reader, struct bare_writer *writer); +int cmd_index(git_repository *repo, struct bare_writer *writer); +int cmd_treeraw(git_repository *repo, struct bare_reader *reader, struct bare_writer *writer); #endif // X_H diff --git a/internal/git2c/cmd1.go b/internal/git2c/cmd_index.go index 68493a2..a705a63 100644 --- a/internal/git2c/cmd1.go +++ b/internal/git2c/cmd_index.go @@ -10,7 +10,7 @@ import ( "io" ) -func (c *Client) Cmd1(repoPath string) ([]Commit, *FilenameContents, error) { +func (c *Client) CmdIndex(repoPath string) ([]Commit, *FilenameContents, error) { if err := c.writer.WriteData([]byte(repoPath)); err != nil { return nil, nil, fmt.Errorf("sending repo path failed: %w", err) } diff --git a/internal/git2c/cmd2.go b/internal/git2c/cmd_treeraw.go index 3bff332..c93480a 100644 --- a/internal/git2c/cmd2.go +++ b/internal/git2c/cmd_treeraw.go @@ -9,7 +9,7 @@ import ( "io" ) -func (c *Client) Cmd2(repoPath, pathSpec string) ([]TreeEntry, string, error) { +func (c *Client) CmdTreeRaw(repoPath, pathSpec string) ([]TreeEntry, string, error) { if err := c.writer.WriteData([]byte(repoPath)); err != nil { return nil, "", fmt.Errorf("sending repo path failed: %w", err) } diff --git a/internal/unsorted/http_handle_repo_index.go b/internal/unsorted/http_handle_repo_index.go index f2bb480..03eed77 100644 --- a/internal/unsorted/http_handle_repo_index.go +++ b/internal/unsorted/http_handle_repo_index.go @@ -25,7 +25,7 @@ func (s *Server) httpHandleRepoIndex(w http.ResponseWriter, req *http.Request, p } defer client.Close() - commits, readme, err := client.Cmd1(repoPath) + commits, readme, err := client.CmdIndex(repoPath) if err != nil { web.ErrorPage500(s.templates, w, params, err.Error()) return diff --git a/internal/unsorted/http_handle_repo_raw.go b/internal/unsorted/http_handle_repo_raw.go index 7849d48..3d999e5 100644 --- a/internal/unsorted/http_handle_repo_raw.go +++ b/internal/unsorted/http_handle_repo_raw.go @@ -32,7 +32,7 @@ func (s *Server) httpHandleRepoRaw(writer http.ResponseWriter, request *http.Req } defer client.Close() - files, content, err := client.Cmd2(repoPath, pathSpec) + files, content, err := client.CmdTreeRaw(repoPath, pathSpec) if err != nil { web.ErrorPage500(s.templates, writer, params, err.Error()) return diff --git a/internal/unsorted/http_handle_repo_tree.go b/internal/unsorted/http_handle_repo_tree.go index cbbba98..96920f6 100644 --- a/internal/unsorted/http_handle_repo_tree.go +++ b/internal/unsorted/http_handle_repo_tree.go @@ -33,7 +33,7 @@ func (s *Server) httpHandleRepoTree(writer http.ResponseWriter, request *http.Re } defer client.Close() - files, content, err := client.Cmd2(repoPath, pathSpec) + files, content, err := client.CmdTreeRaw(repoPath, pathSpec) if err != nil { web.ErrorPage500(s.templates, writer, params, err.Error()) return |