Do not double-check cbdataReferenceDone() argument (#1537)

cbdataReferenceDone internally checks that the argument is not null.
Remove duplicate check from all callsites that have it

diff --git a/src/StoreIOState.cc b/src/StoreIOState.cc
index 38873cd7ec217dd2c8ff4525a773e734adfd29f1..3b77dbe51db2098a7c9c987e261fe50b4c8cf270 100644 (file)
--- a/src/StoreIOState.cc
+++ b/src/StoreIOState.cc
@@ -45,11 +45,8 @@ StoreIOState::~StoreIOState()
 {
     debugs(20,3, "StoreIOState::~StoreIOState: " << this);
 
-    if (read.callback_data)
-        cbdataReferenceDone(read.callback_data);
-
-    if (callback_data)
-        cbdataReferenceDone(callback_data);
+    cbdataReferenceDone(read.callback_data);
+    cbdataReferenceDone(callback_data);
 }
 
 bool StoreIOState::touchingStoreEntry() const

diff --git a/src/client_side.cc b/src/client_side.cc
index b5fd933b369dc5ebcde663a44023b9f8a355513e..c9a3a510a6e6cf68e9c92701fc2a09b441551894 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -3918,8 +3918,7 @@ ConnStateData::unpinConnection(const bool andClose)
 {
     debugs(33, 3, pinning.serverConnection);
 
-    if (pinning.peer)
-        cbdataReferenceDone(pinning.peer);
+    cbdataReferenceDone(pinning.peer);
 
     if (Comm::IsConnOpen(pinning.serverConnection)) {
         if (pinning.closeHandler != nullptr) {

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index 91a289bfc5cef282c90c9bc3c8a9bcb36402eed2..5b5b5af8086d29122246b2686b8cd0f74255f2eb 100644 (file)
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -105,8 +105,7 @@ ClientRequestContext::~ClientRequestContext()
      * still have one
      */
 
-    if (http)
-        cbdataReferenceDone(http);
+    cbdataReferenceDone(http);
 
     delete error;
     debugs(85,3, "ClientRequestContext destructed, this=" << this);
@@ -257,8 +256,7 @@ ClientHttpRequest::~ClientHttpRequest()
 
     delete calloutContext;
 
-    if (conn_)
-        cbdataReferenceDone(conn_);
+    cbdataReferenceDone(conn_);
 
     /* moving to the next connection is handled by the context free */
     dlinkDelete(&active, &ClientActiveRequests);

diff --git a/src/esi/Assign.cc b/src/esi/Assign.cc
index 8fb062705e1ccb2a6011d73884779ec02439b0cf..35c09d737defbf1ca42b0c2dbc45a5e3b650858a 100644 (file)
--- a/src/esi/Assign.cc
+++ b/src/esi/Assign.cc
@@ -139,8 +139,7 @@ ESIAssign::makeUsable(esiTreeParentPtr aParent, ESIVarState &aVarState) const
 void
 ESIAssign::finish()
 {
-    if (varState)
-        cbdataReferenceDone (varState);
+    cbdataReferenceDone(varState);
 
     if (parent.getRaw())
         parent = nullptr;

diff --git a/src/esi/Esi.cc b/src/esi/Esi.cc
index fc0443872bca5b5627dd84b189223102aea0f8ae..c4e9194586c09bb4a5c47635b587fd5976e90e79 100644 (file)
--- a/src/esi/Esi.cc
+++ b/src/esi/Esi.cc
@@ -2185,8 +2185,7 @@ esiWhen::~esiWhen()
 {
     safe_free (unevaluatedExpression);
 
-    if (varState)
-        cbdataReferenceDone (varState);
+    cbdataReferenceDone(varState);
 }
 
 void

diff --git a/src/fs/rock/RockIoState.cc b/src/fs/rock/RockIoState.cc
index d86d6c21bceceb657e29c84d366959b443a96683..59f638c451493d42a9b9d466081649c529e2e116 100644 (file)
--- a/src/fs/rock/RockIoState.cc
+++ b/src/fs/rock/RockIoState.cc
@@ -58,8 +58,7 @@ Rock::IoState::~IoState()
     // assert(!readableAnchor_);
     assert(shutting_down || !writeableAnchor_);
 
-    if (callback_data)
-        cbdataReferenceDone(callback_data);
+    cbdataReferenceDone(callback_data);
     theFile = nullptr;
 
     e->unlock("rock I/O");