X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fdaemon%2Futils_subst.c;h=0b5f00d14577b711751a86396b3d87da0d3aeae9;hp=546ca186f812fd4b5a672b20b0340d4e4bb4b039;hb=54619dc85fd308b21ed09a0271e5c7383c7921b9;hpb=7b8851b26928b609ce850e78c1eabb50ff319244 diff --git a/src/daemon/utils_subst.c b/src/daemon/utils_subst.c index 546ca186..0b5f00d1 100644 --- a/src/daemon/utils_subst.c +++ b/src/daemon/utils_subst.c @@ -30,7 +30,7 @@ #include "collectd.h" -#include "common.h" +#include "utils/common/common.h" #include "utils_subst.h" char *subst(char *buf, size_t buflen, const char *string, size_t off1, @@ -90,28 +90,6 @@ char *subst(char *buf, size_t buflen, const char *string, size_t off1, return buf; } /* subst */ -char *asubst(const char *string, int off1, int off2, const char *replacement) { - char *buf; - int len; - - char *ret; - - if ((NULL == string) || (0 > off1) || (0 > off2) || (off1 > off2) || - (NULL == replacement)) - return NULL; - - len = off1 + strlen(replacement) + strlen(string) - off2 + 1; - - buf = malloc(len); - if (NULL == buf) - return NULL; - - ret = subst(buf, len, string, off1, off2, replacement); - if (NULL == ret) - free(buf); - return ret; -} /* asubst */ - char *subst_string(char *buf, size_t buflen, const char *string, const char *needle, const char *replacement) { size_t needle_len;