git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: christian.couder@gmail.com, Matthieu.Moy@grenoble-inp.fr,
	Karthik Nayak <karthik.188@gmail.com>
Subject: [WIP/PATCH v5 10/10] ref-filter: make 'ref_array_item' use a FLEX_ARRAY for refname
Date: Sat,  6 Jun 2015 12:39:41 +0530	[thread overview]
Message-ID: <1433574581-23980-10-git-send-email-karthik.188@gmail.com> (raw)
In-Reply-To: <1433574581-23980-1-git-send-email-karthik.188@gmail.com>

This would remove the need of using a pointer to store refname.

Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
---
 ref-filter.c | 7 ++++---
 ref-filter.h | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ref-filter.c b/ref-filter.c
index c32b86f..1bd1a28 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -831,8 +831,10 @@ static struct ref_array_item *new_ref_array_item(const char *refname,
 						 const unsigned char *objectname,
 						 int flag)
 {
-	struct ref_array_item *ref = xcalloc(1, sizeof(struct ref_array_item));
-	ref->refname = xstrdup(refname);
+	size_t len = strlen(refname);
+	struct ref_array_item *ref = xcalloc(1, sizeof(struct ref_array_item) + len + 1);
+	memcpy(ref->refname, refname, len);
+	ref->refname[len] = '\0';
 	hashcpy(ref->objectname, objectname);
 	ref->flag = flag;
 
@@ -873,7 +875,6 @@ static int ref_filter_handler(const char *refname, const unsigned char *sha1, in
 static void free_array_item(struct ref_array_item *item)
 {
 	free(item->symref);
-	free(item->refname);
 	free(item);
 }
 
diff --git a/ref-filter.h b/ref-filter.h
index 15e6766..041a39a 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -29,7 +29,7 @@ struct ref_array_item {
 	int flag;
 	char *symref;
 	struct atom_value *value;
-	char *refname;
+	char refname[FLEX_ARRAY];
 };
 
 struct ref_array {
-- 
2.4.2

  parent reply	other threads:[~2015-06-06  7:10 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-06  7:04 [WIP/PATCH v5 0/10] create ref-filter from for-each-ref Karthik Nayak
2015-06-06  7:09 ` [WIP/PATCH v5 01/10] for-each-ref: extract helper functions out of grab_single_ref() Karthik Nayak
2015-06-06  7:09   ` [WIP/PATCH v5 02/10] for-each-ref: clean up code Karthik Nayak
2015-06-08 14:37     ` Matthieu Moy
2015-06-08 15:21       ` Karthik Nayak
2015-06-08 16:23         ` Matthieu Moy
2015-06-06  7:09   ` [WIP/PATCH v5 03/10] for-each-ref: rename 'refinfo' to 'ref_array_item' Karthik Nayak
2015-06-08 14:42     ` Matthieu Moy
2015-06-08 15:19       ` Karthik Nayak
2015-06-06  7:09   ` [WIP/PATCH v5 04/10] for-each-ref: introduce new structures for better organisation Karthik Nayak
2015-06-06  7:09   ` [WIP/PATCH v5 05/10] for-each-ref: introduce 'ref_array_clear()' Karthik Nayak
2015-06-08 14:53     ` Matthieu Moy
2015-06-08 15:18       ` Karthik Nayak
2015-06-08 15:18       ` Karthik Nayak
2015-06-08 16:26         ` Matthieu Moy
2015-06-08 17:05           ` Junio C Hamano
2015-06-08 17:21             ` Matthieu Moy
2015-06-08 20:19               ` Karthik Nayak
2015-06-09  6:31                 ` Matthieu Moy
2015-06-06  7:09   ` [WIP/PATCH v5 06/10] for-each-ref: rename some functions and make them public Karthik Nayak
2015-06-06  7:09   ` [WIP/PATCH v5 07/10] ref-filter: add 'ref-filter.h' Karthik Nayak
2015-06-06  7:09   ` [WIP/PATCH v5 08/10] ref-filter: move code from 'for-each-ref' Karthik Nayak
2015-06-06  7:09   ` [WIP/PATCH v5 09/10] for-each-ref: introduce filter_refs() Karthik Nayak
2015-06-06  7:09   ` Karthik Nayak [this message]
2015-06-06  9:40 ` [WIP/PATCH v5 0/10] create ref-filter from for-each-ref Christian Couder
2015-06-06 10:53   ` Karthik Nayak
2015-06-06 11:26 ` Karthik Nayak

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

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

  git send-email \
    --in-reply-to=1433574581-23980-10-git-send-email-karthik.188@gmail.com \
    --to=karthik.188@gmail.com \
    --cc=Matthieu.Moy@grenoble-inp.fr \
    --cc=christian.couder@gmail.com \
    --cc=git@vger.kernel.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.
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 NNTP newsgroup(s).