===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff/xmalloc.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/diff/xmalloc.c	2015/06/17 20:50:10	1.7
--- src/usr.bin/diff/xmalloc.c	2015/09/25 16:16:26	1.8
***************
*** 1,4 ****
! /* $OpenBSD: xmalloc.c,v 1.7 2015/06/17 20:50:10 nicm Exp $ */
  /*
   * Author: Tatu Ylonen <ylo@cs.hut.fi>
   * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
--- 1,4 ----
! /* $OpenBSD: xmalloc.c,v 1.8 2015/09/25 16:16:26 tedu Exp $ */
  /*
   * Author: Tatu Ylonen <ylo@cs.hut.fi>
   * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
***************
*** 27,37 ****
  {
  	void *ptr;
  
- 	if (size == 0)
- 		errx(2, "xmalloc: zero size");
  	ptr = malloc(size);
  	if (ptr == NULL)
! 		err(2, NULL);
  	return ptr;
  }
  
--- 27,35 ----
  {
  	void *ptr;
  
  	ptr = malloc(size);
  	if (ptr == NULL)
! 		err(2, "xmalloc %zu", size);
  	return ptr;
  }
  
***************
*** 40,53 ****
  {
  	void *ptr;
  
- 	if (size == 0 || nmemb == 0)
- 		errx(2, "xcalloc: zero size");
- 	if (SIZE_MAX / nmemb < size)
- 		errx(2, "xcalloc: nmemb * size > SIZE_MAX");
  	ptr = calloc(nmemb, size);
  	if (ptr == NULL)
! 		errx(2, "xcalloc: out of memory (allocating %lu bytes)",
! 		    (u_long)(size * nmemb));
  	return ptr;
  }
  
--- 38,47 ----
  {
  	void *ptr;
  
  	ptr = calloc(nmemb, size);
  	if (ptr == NULL)
! 		err(2, "xcalloc: out of memory (allocating %zu*%zu bytes)",
! 		    nmemb, size);
  	return ptr;
  }
  
***************
*** 58,75 ****
  
  	new_ptr = reallocarray(ptr, nmemb, size);
  	if (new_ptr == NULL)
! 		err(2, NULL);
  	return new_ptr;
  }
  
- void
- xfree(void *ptr)
- {
- 	if (ptr == NULL)
- 		err(2, NULL);
- 	free(ptr);
- }
- 
  char *
  xstrdup(const char *str)
  {
--- 52,61 ----
  
  	new_ptr = reallocarray(ptr, nmemb, size);
  	if (new_ptr == NULL)
! 		err(2, "xrealloc %zu*%zu", nmemb, size);
  	return new_ptr;
  }
  
  char *
  xstrdup(const char *str)
  {
***************
*** 91,97 ****
  	va_end(ap);
  
  	if (i < 0 || *ret == NULL)
! 		err(2, NULL);
  
  	return (i);
  }
--- 77,83 ----
  	va_end(ap);
  
  	if (i < 0 || *ret == NULL)
! 		err(2, "xasprintf");
  
  	return (i);
  }