From: Stephen Morris <stephen@isc.org>
Date: Tue, 25 Jun 2019 15:36:12 +0000 (+0100)
Subject: [#640,!351] Correct naming of member variables
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=70b469909d0990d5bb4921a5f1309beaacfcbb8c;p=thirdparty%2Fkea.git

[#640,!351] Correct naming of member variables

Ensure that all member variable names are now suffixed with an underscore.
---

diff --git a/src/lib/dhcpsrv/fuzz.cc b/src/lib/dhcpsrv/fuzz.cc
index f9253124a2..592d5b720c 100644
--- a/src/lib/dhcpsrv/fuzz.cc
+++ b/src/lib/dhcpsrv/fuzz.cc
@@ -70,7 +70,7 @@ FuzzSync::notify(void) {
 Fuzz::Fuzz(int ipversion, volatile bool* shutdown) :
     fuzz_sync_("fuzz_sync"), main_sync_("main_sync"), address_(nullptr),
     interface_(nullptr), loop_max_(LOOP_COUNT), port_(0), running_(false),
-    sockaddr_ptr(nullptr), sockaddr_len(0), shutdown_ptr_(nullptr) {
+    sockaddr_ptr_(nullptr), sockaddr_len_(0), shutdown_ptr_(nullptr) {
 
     try {
         stringstream reason;    // Used to construct exception messages
@@ -176,8 +176,8 @@ Fuzz::setAddress(int ipversion) {
         }
         servaddr4_.sin_port = htons(port_);
 
-        sockaddr_ptr = reinterpret_cast<sockaddr*>(&servaddr4_);
-        sockaddr_len = sizeof(servaddr4_);
+        sockaddr_ptr_ = reinterpret_cast<sockaddr*>(&servaddr4_);
+        sockaddr_len_ = sizeof(servaddr4_);
 
     } else if ((strstr(address_, ":") != NULL) && (ipversion == 6)) {
 
@@ -200,8 +200,8 @@ Fuzz::setAddress(int ipversion) {
             isc_throw(FuzzInitFail, reason.str());
         }
 
-        sockaddr_ptr = reinterpret_cast<sockaddr*>(&servaddr6_);
-        sockaddr_len = sizeof(servaddr6_);
+        sockaddr_ptr_ = reinterpret_cast<sockaddr*>(&servaddr6_);
+        sockaddr_len_ = sizeof(servaddr6_);
     } else {
         reason << "Expected IP version (" << ipversion << ") is not "
                << "4 or 6, or the given address " << address_ << " does not "
@@ -262,8 +262,8 @@ Fuzz::run(void) {
         // some form of synchronization, this approach does not work.
 
         // Send the data to the main Kea thread.
-        ssize_t sent = sendto(sockfd, buf, length, 0, sockaddr_ptr,
-                              sockaddr_len);
+        ssize_t sent = sendto(sockfd, buf, length, 0, sockaddr_ptr_,
+                              sockaddr_len_);
         if (sent < 0) {
             LOG_ERROR(fuzz_logger, FUZZ_SEND_ERROR).arg(strerror(errno));
             continue;
diff --git a/src/lib/dhcpsrv/fuzz.h b/src/lib/dhcpsrv/fuzz.h
index c51f18e587..a6009338a5 100644
--- a/src/lib/dhcpsrv/fuzz.h
+++ b/src/lib/dhcpsrv/fuzz.h
@@ -166,8 +166,8 @@ public:
     long                loop_max_;      //< Maximum number of loop iterations
     uint16_t            port_;          //< Port number to use
     volatile bool       running_;       //< Set if the thread is running
-    struct sockaddr*    sockaddr_ptr;   //< Pointer to structure used
-    size_t              sockaddr_len;   //< Length of the structure
+    struct sockaddr*    sockaddr_ptr_;  //< Pointer to structure used
+    size_t              sockaddr_len_;  //< Length of the structure
     struct sockaddr_in  servaddr4_;     //< IPv6 address information
     struct sockaddr_in6 servaddr6_;     //< IPv6 address information
     volatile bool*      shutdown_ptr_;  //< Pointer to shutdown flag