git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "James Bowes" <jbowes@dangerouslyinc.com>
To: "Morten Welinder" <mwelinder@gmail.com>
Cc: junkio@cox.net, git@vger.kernel.org
Subject: Re: [PATCH] use xrealloc in help.c
Date: Tue, 27 Mar 2007 20:53:52 -0400	[thread overview]
Message-ID: <3f80363f0703271753h631f52f4v3899b877285962@mail.gmail.com> (raw)
In-Reply-To: <118833cc0703271540l6615b413gd1df3dc5525a2d00@mail.gmail.com>

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@dangerouslyinc.com>
---

On 3/27/07, Morten Welinder <mwelinder@gmail.com> 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

      reply	other threads:[~2007-03-28  0:53 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-03-27 22:30 [PATCH] use xrealloc in help.c James Bowes
2007-03-27 22:40 ` Morten Welinder
2007-03-28  0:53   ` James Bowes [this message]

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=3f80363f0703271753h631f52f4v3899b877285962@mail.gmail.com \
    --to=jbowes@dangerouslyinc.com \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    --cc=mwelinder@gmail.com \
    /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).