From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Fri, 28 Jul 2006 03:10:15 +0000 (+0000)
Subject: DEVEL15-windows-remove-bad-asserts-20060728
X-Git-Tag: openafs-devel-1_5_4~3
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=8ad395fb8bf3758a48d1f92263fba62116d6dbb8;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-remove-bad-asserts-20060728


remove assert()s that should simply be if()


(cherry picked from commit a4211966d7f9d16dd2f93c9122ba09b4920dfd8e)
---

diff --git a/src/WINNT/afsd/cm_scache.c b/src/WINNT/afsd/cm_scache.c
index b7910991a..ecf4aad65 100644
--- a/src/WINNT/afsd/cm_scache.c
+++ b/src/WINNT/afsd/cm_scache.c
@@ -1080,12 +1080,13 @@ void cm_SyncOpDone(cm_scache_t *scp, cm_buf_t *bufp, afs_uint32 flags)
         /* ensure that the buffer isn't already in the I/O list */
         for(qdp = scp->bufReadsp; qdp; qdp = (osi_queueData_t *) osi_QNext(&qdp->q)) {
             tbufp = osi_GetQData(qdp);
-            if (tbufp == bufp) break;
+            if (tbufp == bufp) 
+		break;
         }
-        osi_assert(qdp != NULL);
-        osi_assert(osi_GetQData(qdp) == bufp);
-        osi_QRemove((osi_queue_t **) &scp->bufReadsp, &qdp->q);
-        osi_QDFree(qdp);
+	if (qdp) {
+	    osi_QRemove((osi_queue_t **) &scp->bufReadsp, &qdp->q);
+	    osi_QDFree(qdp);
+	}
         if (bufp) {
             bufp->cmFlags &= ~(CM_BUF_CMFETCHING | CM_BUF_CMFULLYFETCHED);
             if (bufp->flags & CM_BUF_WAITING) {
@@ -1101,12 +1102,13 @@ void cm_SyncOpDone(cm_scache_t *scp, cm_buf_t *bufp, afs_uint32 flags)
         /* ensure that the buffer isn't already in the I/O list */
         for(qdp = scp->bufWritesp; qdp; qdp = (osi_queueData_t *) osi_QNext(&qdp->q)) {
             tbufp = osi_GetQData(qdp);
-            if (tbufp == bufp) break;
+            if (tbufp == bufp) 
+		break;
         }
-        osi_assert(qdp != NULL);
-        osi_assert(osi_GetQData(qdp) == bufp);
-        osi_QRemove((osi_queue_t **) &scp->bufWritesp, &qdp->q);
-        osi_QDFree(qdp);
+	if (qdp) {
+	    osi_QRemove((osi_queue_t **) &scp->bufWritesp, &qdp->q);
+	    osi_QDFree(qdp);
+	}
         if (bufp) {
             bufp->cmFlags &= ~CM_BUF_CMSTORING;
             if (bufp->flags & CM_BUF_WAITING) {