1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-01 08:27:59 +00:00

Merge texinfo 4.6 changes onto the trunk.

This commit is contained in:
Ruslan Ermilov 2003-06-18 13:02:02 +00:00
parent 24cb3cb6cc
commit 7acf5f7d48
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=116531

View File

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