summaryrefslogtreecommitdiffstats
path: root/contrib/texinfo
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2003-06-18 13:02:02 +0000
committerru <ru@FreeBSD.org>2003-06-18 13:02:02 +0000
commitf5cf3eb74ede2da8674d0fa51c5ae79f6a2c122c (patch)
tree78274171c9a485f50734a0df74239c0637576706 /contrib/texinfo
parentf1e52b4cb24e1d808e7ea84f9f064db504432db4 (diff)
downloadFreeBSD-src-f5cf3eb74ede2da8674d0fa51c5ae79f6a2c122c.zip
FreeBSD-src-f5cf3eb74ede2da8674d0fa51c5ae79f6a2c122c.tar.gz
Merge texinfo 4.6 changes onto the trunk.
Diffstat (limited to 'contrib/texinfo')
-rw-r--r--contrib/texinfo/util/install-info.c32
1 files changed, 3 insertions, 29 deletions
diff --git a/contrib/texinfo/util/install-info.c b/contrib/texinfo/util/install-info.c
index 7f538b6..2bd8cf6 100644
--- a/contrib/texinfo/util/install-info.c
+++ b/contrib/texinfo/util/install-info.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/* install-info -- create Info directory entry(ies) for an Info file.
- $Id: install-info.c,v 1.7 2003/01/19 18:46:51 karl Exp $
+ $Id: install-info.c,v 1.9 2003/05/19 13:10:59 karl Exp $
Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software
Foundation, Inc.
@@ -169,33 +169,6 @@ fatal (s1, s2, s3)
xexit (1);
}
-/* Memory allocation and string operations. */
-
-/* Like malloc but get fatal error if memory is exhausted. */
-void *
-xmalloc (size)
- unsigned int size;
-{
- extern void *malloc ();
- void *result = malloc (size);
- if (result == NULL)
- fatal (_("virtual memory exhausted"), 0, 0);
- return result;
-}
-
-/* Like realloc but get fatal error if memory is exhausted. */
-void *
-xrealloc (obj, size)
- void *obj;
- unsigned int size;
-{
- extern void *realloc ();
- void *result = realloc (obj, size);
- if (result == NULL)
- fatal (_("virtual memory exhausted"), 0, 0);
- return result;
-}
-
/* Return a newly-allocated string
whose contents concatenate those of S1, S2, S3. */
char *
@@ -1428,7 +1401,7 @@ For more information about these matters, see the files named COPYING.\n"),
}
if (!spec || spec == entry->entry_sections_tail)
continue;
-
+
/* Subtract one because dir_lines is zero-based,
but the `end_line' and `start_line' members are
one-based. */
@@ -1478,6 +1451,7 @@ For more information about these matters, see the files named COPYING.\n"),
entries_to_add, input_sections, compression_program);
xexit (0);
+ return 0; /* Avoid bogus warnings. */
}
/* Divide the text at DATA (of SIZE bytes) into lines.
OpenPOWER on IntegriCloud