From: Florian Forster Date: Sun, 22 Jun 2008 16:00:52 +0000 (+0200) Subject: src/rrd_client.[ch]: Change the `rrdd_' prefix to `rrdc_'. X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=commitdiff_plain;h=a46dfeb1b35603f76674f2fc27a6c66691e9e738 src/rrd_client.[ch]: Change the `rrdd_' prefix to `rrdc_'. --- diff --git a/src/rrd_client.c b/src/rrd_client.c index 619a32a..a34ecfe 100644 --- a/src/rrd_client.c +++ b/src/rrd_client.c @@ -68,7 +68,7 @@ static int buffer_add_value (const char *value, /* {{{ */ return (buffer_add_string (temp, buffer_ret, buffer_size_ret)); } /* }}} int buffer_add_value */ -static int rrdd_connect_unix (const char *path) /* {{{ */ +static int rrdc_connect_unix (const char *path) /* {{{ */ { struct sockaddr_un sa; int status; @@ -117,9 +117,9 @@ static int rrdd_connect_unix (const char *path) /* {{{ */ pthread_mutex_unlock (&lock); return (0); -} /* }}} int rrdd_connect_unix */ +} /* }}} int rrdc_connect_unix */ -int rrdd_connect (const char *addr) /* {{{ */ +int rrdc_connect (const char *addr) /* {{{ */ { struct addrinfo ai_hints; struct addrinfo *ai_res; @@ -130,9 +130,9 @@ int rrdd_connect (const char *addr) /* {{{ */ addr = RRDD_SOCK_PATH; if (strncmp ("unix:", addr, strlen ("unix:")) == 0) - return (rrdd_connect_unix (addr + strlen ("unix:"))); + return (rrdc_connect_unix (addr + strlen ("unix:"))); else if (addr[0] == '/') - return (rrdd_connect_unix (addr)); + return (rrdc_connect_unix (addr)); pthread_mutex_lock (&lock); @@ -192,9 +192,9 @@ int rrdd_connect (const char *addr) /* {{{ */ pthread_mutex_unlock (&lock); return (status); -} /* }}} int rrdd_connect */ +} /* }}} int rrdc_connect */ -int rrdd_disconnect (void) /* {{{ */ +int rrdc_disconnect (void) /* {{{ */ { int status; @@ -216,9 +216,9 @@ int rrdd_disconnect (void) /* {{{ */ pthread_mutex_unlock (&lock); return (status); -} /* }}} int rrdd_disconnect */ +} /* }}} int rrdc_disconnect */ -int rrdd_update (const char *filename, int values_num, /* {{{ */ +int rrdc_update (const char *filename, int values_num, /* {{{ */ const char * const *values) { char buffer[4096]; diff --git a/src/rrd_client.h b/src/rrd_client.h index e4b012e..0585023 100644 --- a/src/rrd_client.h +++ b/src/rrd_client.h @@ -25,10 +25,10 @@ #define RRDD_SOCK_PATH "unix:/tmp/rrdd.sock" #define DEFAULT_PORT "42217" -int rrdd_connect (const char *addr); -int rrdd_disconnect (void); +int rrdc_connect (const char *addr); +int rrdc_disconnect (void); -int rrdd_update (const char *filename, int values_num, +int rrdc_update (const char *filename, int values_num, const char * const *values); #endif /* __RRD_CLIENT_H */ diff --git a/src/rrd_update.c b/src/rrd_update.c index 6158a9e..e00cfd2 100644 --- a/src/rrd_update.c +++ b/src/rrd_update.c @@ -323,7 +323,7 @@ static int send_values_to_daemon (const char *addr, const char *file, { int status; - status = rrdd_connect ((addr != NULL) ? addr : RRDD_SOCK_PATH); + status = rrdc_connect ((addr != NULL) ? addr : RRDD_SOCK_PATH); if (status != 0) { if (!silent) @@ -336,7 +336,7 @@ static int send_values_to_daemon (const char *addr, const char *file, return (status); } - status = rrdd_update (file, values_num, values); + status = rrdc_update (file, values_num, values); if (status != 0) { if (!silent) @@ -346,11 +346,11 @@ static int send_values_to_daemon (const char *addr, const char *file, ? "Internal error" : rrd_strerror (status)); } - rrdd_disconnect (); + rrdc_disconnect (); return (status); } - rrdd_disconnect (); + rrdc_disconnect (); return (0); } /* int send_values_to_daemon */