[master] Removed extraneous expression from omapi socket callback

    Merges in rt42834.

diff --git a/RELNOTES b/RELNOTES
index 23c923308fccb617710c609e357a86c1cc96440e..5666f4601551c932aebae977e478b58d7de8375e 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -60,6 +60,12 @@ by Eric Young (eay@cryptsoft.com).
   script.
   [ISC-Bugs #39863]
 
+- Removed an extraneous expression in omapi socket callback function. Prior
+  to this change, the logic was techinically incorrect but other factors
+  ensured the outcome itself was correct.  This change was made primarily
+  for code clarity.
+  [ISC-Bugs #42834]
+
                        Changes since 4.3.0 (bug fixes)
 
 - Tidy up several small tickets.

diff --git a/omapip/dispatch.c b/omapip/dispatch.c
index be3918b68e04187e11777d57c5f4098bdc8808e8..d42d744033ec443cb9d2125ff2021fc9b90d4e97 100644 (file)
--- a/omapip/dispatch.c
+++ b/omapip/dispatch.c
@@ -134,12 +134,11 @@ omapi_iscsock_cb(isc_task_t   *task,
         * walk through the io states list, if our object is on there
         * service it.  if not ignore it.
         */
-       for (obj = omapi_io_states.next;
-            (obj != NULL) && (obj->next != NULL);
-            obj = obj->next) {
+       for (obj = omapi_io_states.next; obj != NULL; obj = obj->next) {
                if (obj == cbarg)
                        break;
        }
+
        if (obj == NULL) {
                return(0);
        }