BIND 10 trac3186, updated. 6291862d54c72d64178fe3c5f5b489120e297e12 [3186] Fixed a couple of minor errors found on Fedora

BIND 10 source code commits bind10-changes at lists.isc.org
Mon Oct 14 18:03:37 UTC 2013


The branch, trac3186 has been updated
       via  6291862d54c72d64178fe3c5f5b489120e297e12 (commit)
      from  14918661a10e2f9c3367f668261656db1ee4bfed (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6291862d54c72d64178fe3c5f5b489120e297e12
Author: Thomas Markwalder <tmark at isc.org>
Date:   Mon Oct 14 14:02:18 2013 -0400

    [3186] Fixed a couple of minor errors found on Fedora
    
    Needed an include of stdint.h and to initialize the UserDataSource::open_flag_
    in its constructor.

-----------------------------------------------------------------------

Summary of changes:
 src/hooks/dhcp/user_chk/user.h              |    3 ++-
 src/hooks/dhcp/user_chk/user_data_source.cc |    5 +----
 src/hooks/dhcp/user_chk/user_file.cc        |    1 +
 3 files changed, 4 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/hooks/dhcp/user_chk/user.h b/src/hooks/dhcp/user_chk/user.h
index afc8962..f949069 100644
--- a/src/hooks/dhcp/user_chk/user.h
+++ b/src/hooks/dhcp/user_chk/user.h
@@ -17,8 +17,9 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <vector>
 #include <map>
+#include <stdint.h>
+#include <vector>
 
 class UserId {
 public:
diff --git a/src/hooks/dhcp/user_chk/user_data_source.cc b/src/hooks/dhcp/user_chk/user_data_source.cc
index 8827d3d..3a4faa2 100644
--- a/src/hooks/dhcp/user_chk/user_data_source.cc
+++ b/src/hooks/dhcp/user_chk/user_data_source.cc
@@ -14,13 +14,10 @@
 
 #include <user_data_source.h>
 
-UserDataSource::UserDataSource() {
+UserDataSource::UserDataSource() : open_flag_(false) {
 }
 
 UserDataSource::~UserDataSource() {
-    if (open_flag_) {
-        close();
-    }
 }
 
 void
diff --git a/src/hooks/dhcp/user_chk/user_file.cc b/src/hooks/dhcp/user_chk/user_file.cc
index 24324c9..4bd5265 100644
--- a/src/hooks/dhcp/user_chk/user_file.cc
+++ b/src/hooks/dhcp/user_chk/user_file.cc
@@ -25,6 +25,7 @@ UserFile::UserFile(const std::string& fname) : fname_(fname) {
 }
 
 UserFile::~UserFile(){
+    close();
 };
 
 void



More information about the bind10-changes mailing list