Merge pull request opendnssec#219 from bellgrim/issue218

Issue opendnssec#218: Fix build warnings.
bellgrim · Aug 8, 2016 · 0380767 · 0380767
2 parents 38bda73 + 824716b
commit 0380767
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -25,6 +25,7 @@ Bugfixes:
   Windows build project.
 * Issue #207: Fix segmentation faults in loadLibrary function.
   (Patch from Jaroslav Imrich)
+* Issue #218: Fix build warnings.
 
 
 SoftHSM 2.1.0 - 2016-03-14

diff --git a/src/lib/P11Attributes.cpp b/src/lib/P11Attributes.cpp
@@ -762,7 +762,7 @@ bool P11AttrCheckValue::setDefault()
 }
 
 // Update the value if allowed
-CK_RV P11AttrCheckValue::updateAttr(Token *token, bool isPrivate, CK_VOID_PTR pValue, CK_ULONG ulValueLen, int op)
+CK_RV P11AttrCheckValue::updateAttr(Token *token, bool isPrivate, CK_VOID_PTR pValue, CK_ULONG ulValueLen, int /*op*/)
 {
 	ByteString plaintext((unsigned char*)pValue, ulValueLen);
 	ByteString value;

diff --git a/src/lib/SoftHSM.cpp b/src/lib/SoftHSM.cpp
@@ -321,6 +321,7 @@ void SoftHSM::reset()
 SoftHSM::SoftHSM()
 {
 	isInitialised = false;
+	isRemovable = false;
 	sessionObjectStore = NULL;
 	objectStore = NULL;
 	slotManager = NULL;