From 7daf45b862b8f53ecabc969615437994edb49fe8 Mon Sep 17 00:00:00 2001
From: Runxi Yu <me@runxiyu.org>
Date: Sun, 06 Apr 2025 08:35:58 +0800
Subject: [PATCH] git2c, git2d: Rename cmd1 and cmd2 descriptively

---
 git2d/cmd1.c                                            | 2 +-
 git2d/cmd2.c                                            | 2 +-
 git2d/session.c                                         | 4 ++--
 git2d/x.h                                               | 4 ++--
 internal/git2c/cmd1.go => internal/git2c/cmd_index.go   | 2 +-
 internal/git2c/cmd2.go => internal/git2c/cmd_treeraw.go | 2 +-
 internal/unsorted/http_handle_repo_index.go             | 2 +-
 internal/unsorted/http_handle_repo_raw.go               | 2 +-
 internal/unsorted/http_handle_repo_tree.go              | 2 +-

diff --git a/git2d/cmd1.c b/git2d/cmd1.c
index d84d2709f1e800f4eb5a5bf48ef4f9a23bbf060c..5d1988d098d0abfa35b816842cb64acec21a3741 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 6edacf29632659a65571fc6b86c3a42ffef0d483..7201a822b45af44a7fdd400a052d2274505253bc 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 5efd218a4fd99eb4650542d51808fc29944023cf..23131ea3ae2d84074e0698a33880c743f464645a 100644
--- a/git2d/session.c
+++ b/git2d/session.c
@@ -48,12 +48,12 @@ 		goto free_repo;
 	}
 	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;
diff --git a/git2d/x.h b/git2d/x.h
index 5a9b32ac33883152fb982777704568338df666c7..96ade205255dcf5a1fa2d8b8696f8f5eb80bae82 100644
--- a/git2d/x.h
+++ b/git2d/x.h
@@ -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
rename from internal/git2c/cmd1.go
rename to internal/git2c/cmd_index.go
index 68493a27295e962644ba822062f14d0ab4ba115e..a705a63ed09a478b5257014b2c2b64e448337c60 100644
--- a/internal/git2c/cmd1.go
+++ b/internal/git2c/cmd_index.go
@@ -10,7 +10,7 @@ 	"fmt"
 	"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
rename from internal/git2c/cmd2.go
rename to internal/git2c/cmd_treeraw.go
index 3bff3327d5a910bd15a3e5c24bf931aa92ee94ae..c93480a8c5e11fe5dfd8f42e029a3ff4826774ec 100644
--- a/internal/git2c/cmd2.go
+++ b/internal/git2c/cmd_treeraw.go
@@ -9,7 +9,7 @@ 	"fmt"
 	"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 f2bb480e5d5652baabf06922b1be769147033f61..03eed7769ff1f1780848bfe3876b624ceb5bbf34 100644
--- a/internal/unsorted/http_handle_repo_index.go
+++ b/internal/unsorted/http_handle_repo_index.go
@@ -25,7 +25,7 @@ 		return
 	}
 	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 7849d481b6fe4570d5457083f17ad3bb0b7ddaf6..3d999e50c087cb8c5f1cc6252405d571a60f8627 100644
--- a/internal/unsorted/http_handle_repo_raw.go
+++ b/internal/unsorted/http_handle_repo_raw.go
@@ -32,7 +32,7 @@ 		return
 	}
 	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 cbbba98ac72a1a89303d1c6d8b7dc9ca43e583e9..96920f659a1ec33990869b9fc0d9c396efaf6608 100644
--- a/internal/unsorted/http_handle_repo_tree.go
+++ b/internal/unsorted/http_handle_repo_tree.go
@@ -33,7 +33,7 @@ 		return
 	}
 	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

-- 
2.48.1