git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
To: git@vger.kernel.org
Cc: Stephen Boyd <sboyd@codeaurora.org>,
	Junio C Hamano <gitster@pobox.com>,
	Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v2 3/7] unpack-trees: factor out dup_entry
Date: Sun,  2 Jun 2013 17:46:53 +0200	[thread overview]
Message-ID: <1370188017-24672-4-git-send-email-rene.scharfe@lsrfire.ath.cx> (raw)
In-Reply-To: <1370188017-24672-1-git-send-email-rene.scharfe@lsrfire.ath.cx>

While we're add it, mark the struct cache_entry pointer of add_entry
const because we only read from it and this allows callers to pass in
const pointers.

Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
---
 unpack-trees.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/unpack-trees.c b/unpack-trees.c
index ede4299..e8b4cc1 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -116,14 +116,20 @@ static void do_add_entry(struct unpack_trees_options *o, struct cache_entry *ce,
 			ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE);
 }
 
-static void add_entry(struct unpack_trees_options *o, struct cache_entry *ce,
-	unsigned int set, unsigned int clear)
+static struct cache_entry *dup_entry(const struct cache_entry *ce)
 {
 	unsigned int size = ce_size(ce);
 	struct cache_entry *new = xmalloc(size);
 
 	memcpy(new, ce, size);
-	do_add_entry(o, new, set, clear);
+	return new;
+}
+
+static void add_entry(struct unpack_trees_options *o,
+		      const struct cache_entry *ce,
+		      unsigned int set, unsigned int clear)
+{
+	do_add_entry(o, dup_entry(ce), set, clear);
 }
 
 /*
-- 
1.8.3

  parent reply	other threads:[~2013-06-02 15:47 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-02 15:46 [PATCH v2 0/7] unpack-trees: plug memory leak for merges René Scharfe
2013-06-02 15:46 ` [PATCH v2 1/7] cache: mark cache_entry pointers const René Scharfe
2013-06-02 15:46 ` [PATCH v2 2/7] read-cache: " René Scharfe
2013-06-02 15:46 ` René Scharfe [this message]
2013-06-02 15:46 ` [PATCH v2 4/7] unpack-trees: create working copy of merge entry in merged_entry René Scharfe
2013-06-02 15:46 ` [PATCH v2 5/7] diff-lib, read-tree, unpack-trees: mark cache_entry pointers const René Scharfe
2013-06-02 15:46 ` [PATCH v2 6/7] diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const René Scharfe
2013-06-02 15:46 ` [PATCH v2 7/7] unpack-trees: free cache_entry array members for merges René Scharfe
2013-06-02 17:25   ` Felipe Contreras
2013-06-02 17:54     ` René Scharfe
2013-06-02 17:59       ` Felipe Contreras
2013-06-02 20:26         ` René Scharfe
2013-06-02 22:38           ` Felipe Contreras
2013-06-02 23:06             ` René Scharfe
2013-06-02 23:23               ` Felipe Contreras
2013-06-02 23:47                 ` René Scharfe
2013-06-03  0:04                   ` Felipe Contreras
2013-06-03 15:59                     ` René Scharfe
2013-06-03 16:10                       ` Felipe Contreras
2013-06-03 16:57                         ` [PATCH v2 8/7] unpack-trees: document that pointer ce can be NULL René Scharfe
2013-06-03 17:40                         ` [PATCH v2 7/7] unpack-trees: free cache_entry array members for merges Junio C Hamano
2013-06-03 20:53                           ` Felipe Contreras

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1370188017-24672-4-git-send-email-rene.scharfe@lsrfire.ath.cx \
    --to=rene.scharfe@lsrfire.ath.cx \
    --cc=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=sboyd@codeaurora.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).