* [PATCH] builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc. @ 2010-12-14 1:48 Thiago Farina 2010-12-18 23:03 ` Thiago Farina 2010-12-19 3:02 ` Nguyen Thai Ngoc Duy 0 siblings, 2 replies; 5+ messages in thread From: Thiago Farina @ 2010-12-14 1:48 UTC (permalink / raw) To: git Signed-off-by: Thiago Farina <tfransosi@gmail.com> --- builtin/rm.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/builtin/rm.c b/builtin/rm.c index c7b7bb3..faeedfc 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -22,10 +22,7 @@ static struct { static void add_list(const char *name) { - if (list.nr >= list.alloc) { - list.alloc = alloc_nr(list.alloc); - list.name = xrealloc(list.name, list.alloc * sizeof(const char *)); - } + ALLOC_GROW(list.name, list.nr + 1, list.alloc); list.name[list.nr++] = name; } -- 1.7.3.2.343.g7d43d ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc. 2010-12-14 1:48 [PATCH] builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc Thiago Farina @ 2010-12-18 23:03 ` Thiago Farina 2010-12-19 3:02 ` Nguyen Thai Ngoc Duy 1 sibling, 0 replies; 5+ messages in thread From: Thiago Farina @ 2010-12-18 23:03 UTC (permalink / raw) To: git; +Cc: Jonathan Nieder On Mon, Dec 13, 2010 at 11:48 PM, Thiago Farina <tfransosi@gmail.com> wrote: > Signed-off-by: Thiago Farina <tfransosi@gmail.com> > --- > builtin/rm.c | 5 +---- > 1 files changed, 1 insertions(+), 4 deletions(-) > > diff --git a/builtin/rm.c b/builtin/rm.c > index c7b7bb3..faeedfc 100644 > --- a/builtin/rm.c > +++ b/builtin/rm.c > @@ -22,10 +22,7 @@ static struct { > > static void add_list(const char *name) > { > - if (list.nr >= list.alloc) { > - list.alloc = alloc_nr(list.alloc); > - list.name = xrealloc(list.name, list.alloc * sizeof(const char *)); > - } > + ALLOC_GROW(list.name, list.nr + 1, list.alloc); > list.name[list.nr++] = name; > } > +Jonathan, he might Ack this. ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc. 2010-12-14 1:48 [PATCH] builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc Thiago Farina 2010-12-18 23:03 ` Thiago Farina @ 2010-12-19 3:02 ` Nguyen Thai Ngoc Duy 2010-12-19 11:56 ` [PATCH v2] " Thiago Farina 1 sibling, 1 reply; 5+ messages in thread From: Nguyen Thai Ngoc Duy @ 2010-12-19 3:02 UTC (permalink / raw) To: Thiago Farina; +Cc: git On Tue, Dec 14, 2010 at 8:48 AM, Thiago Farina <tfransosi@gmail.com> wrote: > static void add_list(const char *name) > { > - if (list.nr >= list.alloc) { > - list.alloc = alloc_nr(list.alloc); > - list.name = xrealloc(list.name, list.alloc * sizeof(const char *)); > - } > + ALLOC_GROW(list.name, list.nr + 1, list.alloc); > list.name[list.nr++] = name; > } add_list() is only used at one place, why not remove it and put the code back in cmd_rm()? -- Duy ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc. 2010-12-19 3:02 ` Nguyen Thai Ngoc Duy @ 2010-12-19 11:56 ` Thiago Farina 2010-12-19 11:58 ` Thiago Farina 0 siblings, 1 reply; 5+ messages in thread From: Thiago Farina @ 2010-12-19 11:56 UTC (permalink / raw) To: git; +Cc: pclouds Signed-off-by: Thiago Farina <tfransosi@gmail.com> --- Changes from v1: - Remove the add_list function since it's used only once per Nguyen Thai Ngoc Duy review. builtin/rm.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/builtin/rm.c b/builtin/rm.c index c7b7bb3..ff491d7 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -20,15 +20,6 @@ static struct { const char **name; } list; -static void add_list(const char *name) -{ - if (list.nr >= list.alloc) { - list.alloc = alloc_nr(list.alloc); - list.name = xrealloc(list.name, list.alloc * sizeof(const char *)); - } - list.name[list.nr++] = name; -} - static int check_local_mod(unsigned char *head, int index_only) { /* @@ -182,7 +173,8 @@ int cmd_rm(int argc, const char **argv, const char *prefix) struct cache_entry *ce = active_cache[i]; if (!match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, seen)) continue; - add_list(ce->name); + ALLOC_GROW(list.name, list.nr + 1, list.alloc); + list.name[list.nr++] = ce->name; } if (pathspec) { -- 1.7.3.2.343.g7d43d ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc. 2010-12-19 11:56 ` [PATCH v2] " Thiago Farina @ 2010-12-19 11:58 ` Thiago Farina 0 siblings, 0 replies; 5+ messages in thread From: Thiago Farina @ 2010-12-19 11:58 UTC (permalink / raw) To: git; +Cc: pclouds, Jonathan Nieder Forgot to copy Jonathan when using 'git send-email'. Now copying him. On Sun, Dec 19, 2010 at 9:56 AM, Thiago Farina <tfransosi@gmail.com> wrote: > Signed-off-by: Thiago Farina <tfransosi@gmail.com> > --- > Changes from v1: > - Remove the add_list function since it's used only once per Nguyen Thai Ngoc Duy > review. > > builtin/rm.c | 12 ++---------- > 1 files changed, 2 insertions(+), 10 deletions(-) > > diff --git a/builtin/rm.c b/builtin/rm.c > index c7b7bb3..ff491d7 100644 > --- a/builtin/rm.c > +++ b/builtin/rm.c > @@ -20,15 +20,6 @@ static struct { > const char **name; > } list; > > -static void add_list(const char *name) > -{ > - if (list.nr >= list.alloc) { > - list.alloc = alloc_nr(list.alloc); > - list.name = xrealloc(list.name, list.alloc * sizeof(const char *)); > - } > - list.name[list.nr++] = name; > -} > - > static int check_local_mod(unsigned char *head, int index_only) > { > /* > @@ -182,7 +173,8 @@ int cmd_rm(int argc, const char **argv, const char *prefix) > struct cache_entry *ce = active_cache[i]; > if (!match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, seen)) > continue; > - add_list(ce->name); > + ALLOC_GROW(list.name, list.nr + 1, list.alloc); > + list.name[list.nr++] = ce->name; > } > > if (pathspec) { > -- > 1.7.3.2.343.g7d43d > > ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-12-19 11:58 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-12-14 1:48 [PATCH] builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc Thiago Farina 2010-12-18 23:03 ` Thiago Farina 2010-12-19 3:02 ` Nguyen Thai Ngoc Duy 2010-12-19 11:56 ` [PATCH v2] " Thiago Farina 2010-12-19 11:58 ` Thiago Farina
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).