Fix style inconsistency in CPBuffer: fillTo -> fill_to

There is generally inconsistent style throughout the codebase, but
at least this one class can be self-consistent...

diff --git a/src/cpbuffer.h b/src/cpbuffer.h
index 3907fd05d8df4684bb8366b3e74e80f863d8e9eb..978720430b47a0b51d8a8e11eb75b35c139fba04 100644 (file)
--- a/src/cpbuffer.h
+++ b/src/cpbuffer.h
@@ -55,9 +55,9 @@ template <int SIZE> class CPBuffer
         return r;
     }
     
-    // fill by readin from the given fd, until at least the specified number of bytes are in
+    // fill by reading from the given fd, until at least the specified number of bytes are in
     // the buffer. Return 0 if end-of-file reached before fill complete, or -1 on error.
-    int fillTo(int fd, int rlength) noexcept
+    int fill_to(int fd, int rlength) noexcept
     {
         while (length < rlength) {
             int r = fill(fd);

diff --git a/src/dinitctl.cc b/src/dinitctl.cc
index 1e5c2fe2f9dce7a89cfb3a637ccf73dc001ea9f6..7218ec7b45e128c312a8b4f6fec34293456f229d 100644 (file)
--- a/src/dinitctl.cc
+++ b/src/dinitctl.cc
@@ -32,7 +32,7 @@ class ReadCPException
 
 static void fillBufferTo(CPBuffer<1024> *buf, int fd, int rlength)
 {
-    int r = buf->fillTo(fd, rlength);
+    int r = buf->fill_to(fd, rlength);
     if (r == -1) {
         throw ReadCPException(errno);
     }
@@ -352,7 +352,7 @@ int main(int argc, char **argv)
         }
         
         // Wait until service started:
-        r = rbuffer.fillTo(socknum, 2);
+        r = rbuffer.fill_to(socknum, 2);
         while (r > 0) {
             if (rbuffer[0] >= 100) {
                 int pktlen = (unsigned char) rbuffer[1];
@@ -385,7 +385,7 @@ int main(int argc, char **argv)
                 }
                 
                 rbuffer.consume(pktlen);
-                r = rbuffer.fillTo(socknum, 2);
+                r = rbuffer.fill_to(socknum, 2);
             }
             else {
                 // Not an information packet?