X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_client.c;h=f271f3db56f25f5906ea1ad11d40e7e879cb47ec;hb=23a7a9744b3f840f358e1c8e8483f93bd2bdf97f;hp=51b2eb8af2bb1c1407c6cbe5c665c0d7e3c94f46;hpb=765772ba1d71e8581f9e65c8c3579997bba5890e;p=rrdtool.git diff --git a/src/rrd_client.c b/src/rrd_client.c index 51b2eb8..f271f3d 100644 --- a/src/rrd_client.c +++ b/src/rrd_client.c @@ -492,7 +492,7 @@ int rrdc_is_connected(const char *daemon_addr) /* {{{ */ * but it is not specified in the current command. * Daemon is only implied in this case if set in ENV */ - if (addr != NULL && ! strcmp(addr,"")) + if (addr != NULL && strcmp(addr,"") != 0) return 1; else return 0; @@ -657,7 +657,7 @@ int rrdc_connect (const char *addr) /* {{{ */ addr = getenv (ENV_RRDCACHED_ADDRESS); } - if (addr == NULL || ! strcmp(addr,"")) { + if (addr == NULL || strcmp(addr,"") == 0) { addr = NULL; return 0; } @@ -913,8 +913,7 @@ rrd_info_t * rrdc_info (const char *filename) /* {{{ */ break; case RD_I_STR: chomp(s); - info.u_str = (char*)malloc(sizeof(char) * (strlen(s) + 1)); - strcpy(info.u_str,s); + info.u_str = strdup(s); break; case RD_I_BLO: rrd_set_error ("rrdc_info: BLOB objects are not supported"); @@ -1495,7 +1494,11 @@ int rrdc_stats_get (rrdc_stats_t **ret_stats) /* {{{ */ response_free (res); if (head == NULL) +#ifdef EPROTO return (EPROTO); +#else + return (EINVAL); +#endif *ret_stats = head; return (0);