Commit Diff

Commit:
b9de8018be96c42d3421711a341c1fc8f6d7e0fb
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
move declaration of got_privsep_child out of got_lib_privsep.h This declaration is the only reason why got_lib_privsep.h must be included in order to use got_lib_repository.h. Moving this declaration will allow for cleaning up unnecessary includes of got_lib_privsep.h.
Actions:
Patch | Tree
commit - 6a800804535a75203abfb3708e68a661c1c89958
commit + b9de8018be96c42d3421711a341c1fc8f6d7e0fb
blob - c6df6ebc501bda287c7350222f5e4ccf706763bf
blob + c3aa573d4997a2dc0cb67ccb37e2059a36d82e87
--- lib/got_lib_pack.h
+++ lib/got_lib_pack.h
@@ -14,13 +14,19 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+struct got_pack_privsep_child {
+	int imsg_fd;
+	pid_t pid;
+	struct imsgbuf *ibuf;
+};
+
 /* An open pack file. */
 struct got_pack {
 	char *path_packfile;
 	int fd;
 	uint8_t *map;
 	size_t filesize;
-	struct got_privsep_child *privsep_child;
+	struct got_pack_privsep_child *privsep_child;
 	int basefd;
 	int accumfd;
 	int child_has_tempfiles;
blob - cc1772cd735799b69ba788a42ce58bc0214cbc96
blob + 1d66ed4d59e710d6c7937f42faafc674ea675e66
--- lib/got_lib_privsep.h
+++ lib/got_lib_privsep.h
@@ -77,12 +77,6 @@
 	GOT_STRINGVAL(GOT_LIBEXECDIR) "/" GOT_STRINGVAL(GOT_PROG_SEND_PACK)
 #define GOT_PATH_PROG_INDEX_PACK \
 	GOT_STRINGVAL(GOT_LIBEXECDIR) "/" GOT_STRINGVAL(GOT_PROG_INDEX_PACK)
-
-struct got_privsep_child {
-	int imsg_fd;
-	pid_t pid;
-	struct imsgbuf *ibuf;
-};
 
 enum got_imsg_type {
 	/* An error occured while processing a request. */
blob - 4015e1cdcca8f6de5990a90e32e88c4004495348
blob + 3e9ad2f8e37f7198f75a99a817a5549bc8daf4f1
--- lib/got_lib_repository.h
+++ lib/got_lib_repository.h
@@ -46,6 +46,12 @@ got_packidx_bloom_filter_cmp(const struct got_packidx_
 	return got_path_cmp(f1->path, f2->path, f1->path_len, f2->path_len);
 }
 
+struct got_repo_privsep_child {
+	int imsg_fd;
+	pid_t pid;
+	struct imsgbuf *ibuf;
+};
+
 struct got_repository {
 	char *path;
 	char *path_git_dir;
@@ -84,7 +90,7 @@ struct got_repository {
 	int pinned_packidx;
 
 	/* Handles to child processes for reading loose objects. */
-	struct got_privsep_child privsep_children[5];
+	struct got_repo_privsep_child privsep_children[5];
 #define GOT_REPO_PRIVSEP_CHILD_OBJECT	0
 #define GOT_REPO_PRIVSEP_CHILD_COMMIT	1
 #define GOT_REPO_PRIVSEP_CHILD_TREE	2