From a89ceb7e2c994e2a3907d9c906d99021a6e15788 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Mon, 8 Oct 2007 11:11:21 +0000 Subject: Punt rc_ from xstrdup, xalloc, xrealloc and exists as they're not in librc anymore --- src/librc-misc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/librc-misc.c') diff --git a/src/librc-misc.c b/src/librc-misc.c index 01baf4a5..ba0122da 100644 --- a/src/librc-misc.c +++ b/src/librc-misc.c @@ -58,7 +58,7 @@ char *rc_strcatpaths (const char *path1, const char *paths, ...) } va_end (ap); - pathp = path = rc_xmalloc (length * sizeof (char *)); + pathp = path = xmalloc (length * sizeof (char *)); memset (path, 0, length); i = strlen (path1); memcpy (path, path1, i); @@ -120,7 +120,7 @@ char **rc_config_load (const char *file) if (! token) continue; - entry = rc_xstrdup (token); + entry = strdup (token); /* Preserve shell coloring */ if (*p == '$') @@ -137,14 +137,14 @@ char **rc_config_load (const char *file) token[i] = 0; i = strlen (entry) + strlen (token) + 2; - newline = rc_xmalloc (i); + newline = xmalloc (i); snprintf (newline, i, "%s=%s", entry, token); replaced = false; /* In shells the last item takes precedence, so we need to remove any prior values we may already have */ STRLIST_FOREACH (list, line, i) { - char *tmp = rc_xstrdup (line); + char *tmp = strdup (line); linep = tmp; linetok = strsep (&linep, "="); if (strcmp (linetok, entry) == 0) { -- cgit v1.2.3