Signed-off-by: James Bowes <redacted>
---
help.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/help.c b/help.c
index be8651a..34b1dda 100644
--- a/help.c
+++ b/help.c
@@ -54,7 +54,7 @@ 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));
+ cmdname = xrealloc(cmdname, cmdname_alloc * sizeof(*cmdname));
if (!cmdname)
oom();
}--
1.5.0.5
- cmdname = realloc(cmdname, cmdname_alloc * sizeof(*cmdname));
+ cmdname = xrealloc(cmdname, cmdname_alloc * sizeof(*cmdname));
if (!cmdname)
oom();
If you are using xrealloc, shouldn't kill the oom check here too?
M.
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 <redacted>
---
On 3/27/07, Morten Welinder [off-list ref] 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