All of lore.kernel.org
 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: [PATCH v8 11/11] ref-filter: make 'ref_array_item' use a FLEX_ARRAY for refname
Date: Sun, 14 Jun 2015 01:07:29 +0530	[thread overview]
Message-ID: <1434224249-21476-11-git-send-email-karthik.188@gmail.com> (raw)
In-Reply-To: <1434224249-21476-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 a1151e0..43502a4 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -847,8 +847,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;
 
@@ -889,7 +891,6 @@ static int ref_filter_handler(const char *refname, const struct object_id *oid,
 static void free_array_item(struct ref_array_item *item)
 {
 	free((char *)item->symref);
-	free(item->refname);
 	free(item);
 }
 
diff --git a/ref-filter.h b/ref-filter.h
index 697b609..6997984 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -32,7 +32,7 @@ struct ref_array_item {
 	int flag;
 	const char *symref;
 	struct atom_value *value;
-	char *refname;
+	char refname[FLEX_ARRAY];
 };
 
 struct ref_array {
-- 
2.4.3.435.g2403634.dirty

  parent reply	other threads:[~2015-06-13 19:39 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-13 19:34 [PATCH v8 0/11] Create ref-filter from for-each-ref karthik nayak
2015-06-13 19:37 ` [PATCH v8 01/11] for-each-ref: extract helper functions out of grab_single_ref() Karthik Nayak
2015-06-13 19:37   ` [PATCH v8 02/11] for-each-ref: clean up code Karthik Nayak
2015-06-13 19:37   ` [PATCH v8 03/11] for-each-ref: rename 'refinfo' to 'ref_array_item' Karthik Nayak
2015-06-13 19:37   ` [PATCH v8 04/11] for-each-ref: introduce new structures for better organisation Karthik Nayak
2015-06-13 19:37   ` [PATCH v8 05/11] for-each-ref: introduce 'ref_array_clear()' Karthik Nayak
2015-06-13 19:37   ` [PATCH v8 06/11] for-each-ref: rename some functions and make them public Karthik Nayak
2015-06-13 19:37   ` [PATCH v8 07/11] for-each-ref: rename variables called sort to sorting Karthik Nayak
2015-06-13 19:37   ` [PATCH v8 08/11] ref-filter: add 'ref-filter.h' Karthik Nayak
2015-06-13 19:37   ` [PATCH v8 09/11] ref-filter: move code from 'for-each-ref' Karthik Nayak
2015-06-13 19:37   ` [PATCH v8 10/11] for-each-ref: introduce filter_refs() Karthik Nayak
2015-06-13 19:37   ` Karthik Nayak [this message]
2015-06-14  8:04 ` [PATCH v8 0/11] Create ref-filter from for-each-ref Matthieu Moy
2015-06-14  8:24   ` karthik nayak
2015-06-15 18:49 ` Junio C Hamano
2015-06-15 20:47   ` 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=1434224249-21476-11-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.