[PATCH] builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.

Subsystems: the rest

STALE3738d

5 messages, 2 authors, 2016-06-15 · open the first message on its own page

[PATCH] builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.

From: Thiago Farina <hidden>
Date: 2016-06-15 22:50:14

Signed-off-by: Thiago Farina <redacted>
---
 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

Re: [PATCH] builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.

From: Thiago Farina <hidden>
Date: 2016-06-15 22:50:16

On Mon, Dec 13, 2010 at 11:48 PM, Thiago Farina [off-list ref] wrote:
quoted hunk
Signed-off-by: Thiago Farina <redacted>
---
 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.

Re: [PATCH] builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.

From: Nguyen Thai Ngoc Duy <hidden>
Date: 2016-06-15 22:50:16

On Tue, Dec 14, 2010 at 8:48 AM, Thiago Farina [off-list ref] 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

[PATCH v2] builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.

From: Thiago Farina <hidden>
Date: 2016-06-15 22:50:16

Signed-off-by: Thiago Farina <redacted>
---
 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

Re: [PATCH v2] builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.

From: Thiago Farina <hidden>
Date: 2016-06-15 22:50:16

Forgot to copy Jonathan when using 'git send-email'. Now copying him.

On Sun, Dec 19, 2010 at 9:56 AM, Thiago Farina [off-list ref] wrote:
quoted hunk
Signed-off-by: Thiago Farina <redacted>
---
 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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help