aboutsummaryrefslogtreecommitdiff
path: root/xmalloc.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2008-08-07 20:20:52 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2008-08-07 20:20:52 +0000
commitde0e1c62843398e211d2588d9fe3c95923733afb (patch)
tree4ed59887a969b2189e8599817541ad6013d1d94e /xmalloc.c
parent65833c29766b1494da4382e3e3741498dc7037e2 (diff)
downloadrtmux-de0e1c62843398e211d2588d9fe3c95923733afb.tar.gz
rtmux-de0e1c62843398e211d2588d9fe3c95923733afb.tar.bz2
rtmux-de0e1c62843398e211d2588d9fe3c95923733afb.zip
Lose ensure* stuff.
Diffstat (limited to 'xmalloc.c')
-rw-r--r--xmalloc.c59
1 files changed, 1 insertions, 58 deletions
diff --git a/xmalloc.c b/xmalloc.c
index ad2c4b70..50b22fef 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -1,4 +1,4 @@
-/* $Id: xmalloc.c,v 1.5 2007-10-19 20:50:01 nicm Exp $ */
+/* $Id: xmalloc.c,v 1.6 2008-08-07 20:20:52 nicm Exp $ */
/*
* Copyright (c) 2004 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -26,63 +26,6 @@
#include "tmux.h"
-void *
-ensure_for(void *buf, size_t *len, size_t size, size_t adj)
-{
- if (adj == 0)
- fatalx("zero adj");
-
- if (SIZE_MAX - size < adj)
- fatalx("size + adj > SIZE_MAX");
- size += adj;
-
- if (*len == 0) {
- *len = BUFSIZ;
- buf = xmalloc(*len);
- }
-
- while (*len <= size) {
- buf = xrealloc(buf, 2, *len);
- *len *= 2;
- }
-
- return (buf);
-}
-
-void *
-ensure_size(void *buf, size_t *len, size_t nmemb, size_t size)
-{
- if (nmemb == 0 || size == 0)
- fatalx("zero size");
- if (SIZE_MAX / nmemb < size)
- fatalx("nmemb * size > SIZE_MAX");
-
- if (*len == 0) {
- *len = BUFSIZ;
- buf = xmalloc(*len);
- }
-
- while (*len <= nmemb * size) {
- buf = xrealloc(buf, 2, *len);
- *len *= 2;
- }
-
- return (buf);
-}
-
-char *
-xmemstrdup(const char *buf, size_t len)
-{
- char *s;
-
- s = xmalloc(len + 1);
- if (len > 0)
- memcpy(s, buf, len);
- s[len] = '\0';
-
- return (s);
-}
-
char *
xstrdup(const char *s)
{