rrdcached(1): Some typo and minor formulation fixes.

[rrdtool.git] / src / rrd_client.c

diff --git a/src/rrd_client.c b/src/rrd_client.c
index eace81c..f1253f8 100644 (file)
--- a/src/rrd_client.c
+++ b/src/rrd_client.c
@@ -34,9 +34,6 @@
 
 static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
 static int sd = -1;
-#if 0
-static FILE *sh;
-#endif
 
 static ssize_t sread (void *buffer_void, size_t buffer_size) /* {{{ */
 {
@@ -62,9 +59,6 @@ static ssize_t sread (void *buffer_void, size_t buffer_size) /* {{{ */
     {
       close (sd);
       sd = -1;
-#if 0
-      sh = NULL;
-#endif
       errno = EPROTO;
       return (-1);
     }
@@ -105,7 +99,11 @@ static ssize_t swrite (const void *buf, size_t count) /* {{{ */
       continue;
 
     if (status < 0)
+    {
+      close (sd);
+      sd = -1;
       return (status);
+    }
 
     nleft = nleft - status;
     ptr   = ptr   + status;
@@ -184,8 +182,7 @@ static int rrdc_connect_unix (const char *path) /* {{{ */
   struct sockaddr_un sa;
   int status;
 
-  if (path == NULL)
-    path = RRDD_SOCK_PATH;
+  assert (path != NULL);
 
   pthread_mutex_lock (&lock);
 
@@ -215,18 +212,6 @@ static int rrdc_connect_unix (const char *path) /* {{{ */
     return (status);
   }
 
-#if 0
-  sh = fdopen (sd, "w+");
-  if (sh == NULL)
-  {
-    status = errno;
-    close (sd);
-    sd = -1;
-    pthread_mutex_unlock (&lock);
-    return (status);
-  }
-#endif
-
   pthread_mutex_unlock (&lock);
 
   return (0);
@@ -240,7 +225,7 @@ int rrdc_connect (const char *addr) /* {{{ */
   int status;
 
   if (addr == NULL)
-    addr = RRDD_SOCK_PATH;
+    addr = RRDCACHED_DEFAULT_ADDRESS;
 
   if (strncmp ("unix:", addr, strlen ("unix:")) == 0)
     return (rrdc_connect_unix (addr + strlen ("unix:")));
@@ -264,7 +249,7 @@ int rrdc_connect (const char *addr) /* {{{ */
   ai_hints.ai_socktype = SOCK_STREAM;
 
   ai_res = NULL;
-  status = getaddrinfo (addr, DEFAULT_PORT, &ai_hints, &ai_res);
+  status = getaddrinfo (addr, RRDCACHED_DEFAULT_PORT, &ai_hints, &ai_res);
   if (status != 0)
   {
     pthread_mutex_unlock (&lock);
@@ -290,17 +275,6 @@ int rrdc_connect (const char *addr) /* {{{ */
       continue;
     }
 
-#if 0
-    sh = fdopen (sd, "w+");
-    if (sh == NULL)
-    {
-      status = errno;
-      close (sd);
-      sd = -1;
-      continue;
-    } 
-#endif
-
     assert (status == 0);
     break;
   } /* for (ai_ptr) */
@@ -311,30 +285,20 @@ int rrdc_connect (const char *addr) /* {{{ */
 
 int rrdc_disconnect (void) /* {{{ */
 {
-  int status;
-
   pthread_mutex_lock (&lock);
 
   if (sd < 0)
   {
     pthread_mutex_unlock (&lock);
-    return (-1);
+    return (0);
   }
 
-#if 0
-  status = fclose (sh);
-  if (status != 0)
-    status = errno;
-
-  sh = NULL;
-#else
-  status = 0;
-#endif
+  close (sd);
   sd = -1;
 
   pthread_mutex_unlock (&lock);
 
-  return (status);
+  return (0);
 } /* }}} int rrdc_disconnect */
 
 int rrdc_update (const char *filename, int values_num, /* {{{ */
@@ -403,7 +367,7 @@ int rrdc_update (const char *filename, int values_num, /* {{{ */
 
   status = atoi (buffer);
   return (status);
-} /* }}} int rrd_update_daemon */
+} /* }}} int rrdc_update */
 
 int rrdc_flush (const char *filename) /* {{{ */
 {