summaryrefslogtreecommitdiff
path: root/xmalloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'xmalloc.c')
-rw-r--r--xmalloc.c73
1 files changed, 35 insertions, 38 deletions
diff --git a/xmalloc.c b/xmalloc.c
index b536f9d19..0f1c43051 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -1,56 +1,53 @@
1/* 1/*
2 2 * Author: Tatu Ylonen <ylo@cs.hut.fi>
3xmalloc.c 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 4 * All rights reserved
5Author: Tatu Ylonen <ylo@cs.hut.fi> 5 * Created: Mon Mar 20 21:23:10 1995 ylo
6 6 * Versions of malloc and friends that check their results, and never return
7Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 7 * failure (they call fatal if they encounter an error).
8 All rights reserved 8 */
9
10Created: Mon Mar 20 21:23:10 1995 ylo
11
12Versions of malloc and friends that check their results, and never return
13failure (they call fatal if they encounter an error).
14
15*/
16 9
17#include "includes.h" 10#include "includes.h"
18RCSID("$Id: xmalloc.c,v 1.1 1999/10/27 03:42:46 damien Exp $"); 11RCSID("$Id: xmalloc.c,v 1.2 1999/11/24 13:26:23 damien Exp $");
19 12
20#include "ssh.h" 13#include "ssh.h"
21 14
22void *xmalloc(size_t size) 15void *
16xmalloc(size_t size)
23{ 17{
24 void *ptr = malloc(size); 18 void *ptr = malloc(size);
25 if (ptr == NULL) 19 if (ptr == NULL)
26 fatal("xmalloc: out of memory (allocating %d bytes)", (int)size); 20 fatal("xmalloc: out of memory (allocating %d bytes)", (int) size);
27 return ptr; 21 return ptr;
28} 22}
29 23
30void *xrealloc(void *ptr, size_t new_size) 24void *
25xrealloc(void *ptr, size_t new_size)
31{ 26{
32 void *new_ptr; 27 void *new_ptr;
33 28
34 if (ptr == NULL) 29 if (ptr == NULL)
35 fatal("xrealloc: NULL pointer given as argument"); 30 fatal("xrealloc: NULL pointer given as argument");
36 new_ptr = realloc(ptr, new_size); 31 new_ptr = realloc(ptr, new_size);
37 if (new_ptr == NULL) 32 if (new_ptr == NULL)
38 fatal("xrealloc: out of memory (new_size %d bytes)", (int)new_size); 33 fatal("xrealloc: out of memory (new_size %d bytes)", (int) new_size);
39 return new_ptr; 34 return new_ptr;
40} 35}
41 36
42void xfree(void *ptr) 37void
38xfree(void *ptr)
43{ 39{
44 if (ptr == NULL) 40 if (ptr == NULL)
45 fatal("xfree: NULL pointer given as argument"); 41 fatal("xfree: NULL pointer given as argument");
46 free(ptr); 42 free(ptr);
47} 43}
48 44
49char *xstrdup(const char *str) 45char *
46xstrdup(const char *str)
50{ 47{
51 int len = strlen(str) + 1; 48 int len = strlen(str) + 1;
52 49
53 char *cp = xmalloc(len); 50 char *cp = xmalloc(len);
54 strlcpy(cp, str, len); 51 strlcpy(cp, str, len);
55 return cp; 52 return cp;
56} 53}