Commit b9c339262887ab888b0c1b714d9a7b13ea0c945b
2018-11-07T08:59:06
avoid unnecessary memcpy in got_privsep_send_commit()
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
diff --git a/lib/privsep.c b/lib/privsep.c
index 678c40e..3cea78f 100644
--- a/lib/privsep.c
+++ b/lib/privsep.c
@@ -405,36 +405,37 @@ const struct got_error *
got_privsep_send_commit(struct imsgbuf *ibuf, struct got_commit_object *commit)
{
const struct got_error *err = NULL;
- struct got_imsg_commit_object icommit;
+ struct got_imsg_commit_object *icommit;
uint8_t *buf;
size_t len, total;
struct got_object_qid *qid;
+ size_t author_len = strlen(commit->author);
+ size_t committer_len = strlen(commit->committer);
size_t logmsg_len = strlen(commit->logmsg);
- memcpy(icommit.tree_id, commit->tree_id->sha1, sizeof(icommit.tree_id));
- icommit.author_len = strlen(commit->author);
- icommit.author_time = commit->author_time;
- icommit.author_gmtoff = commit->author_gmtoff;
- icommit.committer_len = strlen(commit->committer);
- icommit.committer_time = commit->committer_time;
- icommit.committer_gmtoff = commit->committer_gmtoff;
- icommit.logmsg_len = logmsg_len;
- icommit.nparents = commit->nparents;
-
- total = sizeof(icommit) + icommit.author_len +
- icommit.committer_len + icommit.nparents * SHA1_DIGEST_LENGTH;
+ total = sizeof(*icommit) + author_len + committer_len +
+ commit->nparents * SHA1_DIGEST_LENGTH;
buf = malloc(total);
if (buf == NULL)
return got_error_from_errno();
- len = 0;
- memcpy(buf + len, &icommit, sizeof(icommit));
- len += sizeof(icommit);
- memcpy(buf + len, commit->author, icommit.author_len);
- len += icommit.author_len;
- memcpy(buf + len, commit->committer, icommit.committer_len);
- len += icommit.committer_len;
+ icommit = (struct got_imsg_commit_object *)buf;
+ memcpy(icommit->tree_id, commit->tree_id->sha1, sizeof(icommit->tree_id));
+ icommit->author_len = author_len;
+ icommit->author_time = commit->author_time;
+ icommit->author_gmtoff = commit->author_gmtoff;
+ icommit->committer_len = committer_len;
+ icommit->committer_time = commit->committer_time;
+ icommit->committer_gmtoff = commit->committer_gmtoff;
+ icommit->logmsg_len = logmsg_len;
+ icommit->nparents = commit->nparents;
+
+ len = sizeof(*icommit);
+ memcpy(buf + len, commit->author, author_len);
+ len += author_len;
+ memcpy(buf + len, commit->committer, committer_len);
+ len += committer_len;
SIMPLEQ_FOREACH(qid, &commit->parent_ids, entry) {
memcpy(buf + len, qid->id, SHA1_DIGEST_LENGTH);
len += SHA1_DIGEST_LENGTH;