texinfo/lib substring.c,1.1.1.1,1.2 system.h,1.1.1.1,1.2 xexit.c,1.1.1.1,1.2 xmalloc.c,1.1.1.1,1.2

[karl]

Update of /cvsroot/texinfo/texinfo/lib
In directory sheep:/tmp/cvs-serv30599

Modified Files:
        substring.c system.h xexit.c xmalloc.c 
Log Message:
protoize

Index: substring.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/lib/substring.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** substring.c 6 Dec 2003 01:33:12 -0000       1.1.1.1
--- substring.c 19 Feb 2004 00:13:00 -0000      1.2
***************
*** 2,6 ****
     $Id$
  
!    Copyright (C) 1999 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 2,6 ----
     $Id$
  
!    Copyright (C) 1999, 2004 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
***************
*** 21,31 ****
  
  char *
! substring (start, end)
!      char *start;
!      char *end;
  {
    char *result = xmalloc (end - start + 1);
    char *scan_result = result;
!   char *scan = start;
  
    while (scan < end)
--- 21,29 ----
  
  char *
! substring (const char *start, const char *end)
  {
    char *result = xmalloc (end - start + 1);
    char *scan_result = result;
!   const char *scan = start;
  
    while (scan < end)

Index: system.h
===================================================================
RCS file: /cvsroot/texinfo/texinfo/lib/system.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** system.h    6 Dec 2003 01:33:16 -0000       1.1.1.1
--- system.h    19 Feb 2004 00:13:00 -0000      1.2
***************
*** 2,6 ****
     $Id$
  
!    Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software
     Foundation, Inc.
  
--- 2,6 ----
     $Id$
  
!    Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
     Foundation, Inc.
  
***************
*** 33,37 ****
     own __declspec declaration.  We don't want to try to duplicate 
     this Microsoft-ism here.  */
! extern char *substring ();
  #endif
  
--- 33,37 ----
     own __declspec declaration.  We don't want to try to duplicate 
     this Microsoft-ism here.  */
! extern char *substring (const char *, const char *);
  #endif
  
***************
*** 255,261 ****
  
  /* Our library routines not included in any system library.  */
! extern void *xmalloc (), *xrealloc ();
! extern char *xstrdup ();
! extern void xexit ();
  
  /* For convenience.  */
--- 255,261 ----
  
  /* Our library routines not included in any system library.  */
! extern void *xmalloc (unsigned), *xrealloc (void *, unsigned);
! extern char *xstrdup (const char *);
! extern void xexit (int);
  
  /* For convenience.  */

Index: xexit.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/lib/xexit.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** xexit.c     6 Dec 2003 01:33:12 -0000       1.1.1.1
--- xexit.c     19 Feb 2004 00:13:00 -0000      1.2
***************
*** 2,6 ****
     $Id$
  
!    Copyright (C) 1999, 2003 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 2,6 ----
     $Id$
  
!    Copyright (C) 1999, 2003, 2004 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
***************
*** 48,53 ****
  
  void
! xexit (exit_status)
!      int exit_status;
  {
    if (ferror (stdout))
--- 48,52 ----
  
  void
! xexit (int exit_status)
  {
    if (ferror (stdout))

Index: xmalloc.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/lib/xmalloc.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** xmalloc.c   6 Dec 2003 01:33:12 -0000       1.1.1.1
--- xmalloc.c   19 Feb 2004 00:13:00 -0000      1.2
***************
*** 1,11 ****
! /* xmalloc.c -- safe versions of malloc and realloc */
! 
! /* This file is part of GNU Info, a program for reading online documentation
!    stored in Info format.
! 
!    This file has appeared in prior works by the Free Software Foundation;
!    thus it carries copyright dates from 1988 through 1993.
  
!    Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993 Free Software
     Foundation, Inc.
  
--- 1,5 ----
! /* xmalloc.c -- safe versions of malloc and realloc.
  
!    Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 2004 Free Software
     Foundation, Inc.
  
***************
*** 33,41 ****
  static void memory_error_and_abort ();
  
! /* **************************************************************** */
! /*                                                                */
! /*               Memory Allocation and Deallocation.              */
! /*                                                                */
! /* **************************************************************** */
  
  /* Return a pointer to free()able block of memory large enough
--- 27,36 ----
  static void memory_error_and_abort ();
  
! static void
! memory_error_and_abort (const char *fname)
! {
!   fprintf (stderr, "%s: Out of virtual memory!\n", fname);
!   abort ();
! }
  
  /* Return a pointer to free()able block of memory large enough
***************
*** 43,48 ****
     print an error message and abort. */
  void *
! xmalloc (bytes)
!      int bytes;
  {
    void *temp = malloc (bytes);
--- 38,42 ----
     print an error message and abort. */
  void *
! xmalloc (unsigned bytes)
  {
    void *temp = malloc (bytes);
***************
*** 54,60 ****
  
  void *
! xrealloc (pointer, bytes)
!      void *pointer;
!      int bytes;
  {
    void *temp;
--- 48,52 ----
  
  void *
! xrealloc (void *pointer, unsigned bytes)
  {
    void *temp;
***************
*** 71,80 ****
  }
  
- static void
- memory_error_and_abort (fname)
-      char *fname;
- {
-   fprintf (stderr, "%s: Out of virtual memory!\n", fname);
-   abort ();
- }
  #endif /* !ALREADY_HAVE_XMALLOC */
--- 63,65 ----