diff options
| author | Roy Marples <roy@marples.name> | 2007-10-08 11:11:21 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2007-10-08 11:11:21 +0000 |
| commit | a89ceb7e2c994e2a3907d9c906d99021a6e15788 (patch) | |
| tree | 5725e344e99804953472a29598eb8c3e04d95c7a /src/librc-misc.c | |
| parent | e7dab9bb91344476603cc01a9db95c891e01085d (diff) | |
Punt rc_ from xstrdup, xalloc, xrealloc and exists as they're not in librc anymore
Diffstat (limited to 'src/librc-misc.c')
| -rw-r--r-- | src/librc-misc.c | 8 |
1 files changed, 4 insertions, 4 deletions
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) { |