From bb94729c098f21ae850044a9201c1d5b92baea1f Mon Sep 17 00:00:00 2001 From: Will Miles Date: Fri, 27 Feb 2015 14:43:23 -0500 Subject: util: Use util-common for strndup in pacsort and pactree This small refactor reduces the number of replications of the local imeplementation of strndup. Signed-off-by: Will Miles Signed-off-by: Allan McRae --- src/util/pactree.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'src/util/pactree.c') diff --git a/src/util/pactree.c b/src/util/pactree.c index 67f456fe..11ad7cae 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -29,6 +29,8 @@ #include #endif +#include "util-common.h" + #define LINE_MAX 512 typedef struct tdepth { @@ -121,28 +123,6 @@ int searchsyncs = 0; const char *dbpath = DBPATH; const char *configfile = CONFFILE; -#ifndef HAVE_STRNDUP -/* A quick and dirty implementation derived from glibc */ -static size_t strnlen(const char *s, size_t max) -{ - register const char *p; - for(p = s; *p && max--; ++p); - return (p - s); -} - -char *strndup(const char *s, size_t n) -{ - size_t len = strnlen(s, n); - char *new = (char *) malloc(len + 1); - - if(new == NULL) - return NULL; - - new[len] = '\0'; - return (char *)memcpy(new, s, len); -} -#endif - static size_t strtrim(char *str) { char *end, *pch = str; -- cgit v1.2.3