Re: [PATCH] use xrealloc in help.c

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



oom() is not needed any more either, since the x* functions check the return
themselves. So get rid of it.

Signed-off-by: James Bowes <jbowes@xxxxxxxxxxxxxxxxxx>
---

On 3/27/07, Morten Welinder <mwelinder@xxxxxxxxx> wrote:
If you are using xrealloc, shouldn't kill the oom check here too?

Good point. There's no need for oom() at all then, anymore.

help.c |   12 +-----------
1 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/help.c b/help.c
index be8651a..6a9af4d 100644
--- a/help.c
+++ b/help.c
@@ -31,12 +31,6 @@ static int term_columns(void)
	return 80;
}

-static void oom(void)
-{
-	fprintf(stderr, "git: out of memory\n");
-	exit(1);
-}
-
static inline void mput_char(char c, unsigned int num)
{
	while(num--)
@@ -54,13 +48,9 @@ static void add_cmdname(const char *name, int len)
	struct cmdname *ent;
	if (cmdname_alloc <= cmdname_cnt) {
		cmdname_alloc = cmdname_alloc + 200;
-		cmdname = realloc(cmdname, cmdname_alloc * sizeof(*cmdname));
-		if (!cmdname)
-			oom();
+		cmdname = xrealloc(cmdname, cmdname_alloc * sizeof(*cmdname));
	}
	ent = xmalloc(sizeof(*ent) + len);
-	if (!ent)
-		oom();
	ent->len = len;
	memcpy(ent->name, name, len);
	ent->name[len] = 0;
--
1.5.0.5
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]