event_routing: Clean up convoluted looping logic

Author: liviuchircu

modules/event_routing/ebr_data.c

@@ -475,9 +475,8 @@ int notify_ebr_subscriptions( ebr_event *ev, evi_params_t *params)
 
 	/* check the EBR subscription on this event and apply the filters */
 	sub_prev = NULL;
-	sub_next = NULL;
-	for ( sub=ev->subs ; sub ; sub_prev=sub,
-								sub=sub_next?sub_next:(sub?sub->next:NULL) ) {
+	for ( sub=ev->subs ; sub ; sub_prev=sub, sub=sub_next) {
+		sub_next = sub->next;
 
 		/* discard expired subscriptions */
 		if (sub->expire<my_time) {
@@ -492,7 +491,6 @@ int notify_ebr_subscriptions( ebr_event *ev, evi_params_t *params)
 				job =(ebr_ipc_job*)shm_malloc( sizeof(ebr_ipc_job) );
 				if (job==NULL) {
 					LM_ERR("failed to allocated new IPC job, skipping..\n");
-					sub_next = sub->next;
 					continue; /* with the next subscription */
 				}
 				job->ev = ev;
@@ -505,12 +503,10 @@ int notify_ebr_subscriptions( ebr_event *ev, evi_params_t *params)
 				if (ipc_send_job( sub->proc_no, ebr_ipc_type , (void*)job)<0) {
 					LM_ERR("failed to send job via IPC, skipping...\n");
 					shm_free(job);
-					sub_next = sub->next;
 					continue; /* keep it and try next time */
 				}
 			}
-			/* remove the subscription */
-			sub_next = sub->next;
+
 			/* unlink it */
 			if (sub_prev) sub_prev->next = sub_next;
 			else ev->subs = sub_next;
@@ -523,7 +519,6 @@ int notify_ebr_subscriptions( ebr_event *ev, evi_params_t *params)
 
 		/* run the filters */
 		matches = 1;
-		sub_next = NULL;
 		for ( filter=sub->filters ; matches && filter ; filter=filter->next ) {
 
 			/* look for the evi param with the same name */
@@ -558,7 +553,6 @@ int notify_ebr_subscriptions( ebr_event *ev, evi_params_t *params)
 			job =(ebr_ipc_job*)shm_malloc( sizeof(ebr_ipc_job) );
 			if (job==NULL) {
 				LM_ERR("failed to allocated new IPC job, skipping..\n");
-				sub_next = sub->next;
 				continue; /* with the next subscription */
 			}
 
@@ -595,9 +589,7 @@ int notify_ebr_subscriptions( ebr_event *ev, evi_params_t *params)
 					LM_ERR("failed to send job via IPC, skipping...\n");
 					shm_free(job);
 				}
-				/* remove the subscription, as it can be triggered only 
-				 * one time */
-				sub_next = sub->next;
+
 				/* unlink it */
 				if (sub_prev) sub_prev->next = sub_next;
 				else ev->subs = sub_next;
@@ -651,15 +643,12 @@ void ebr_timeout(unsigned int ticks, void* param)
 
 		/* check the EBR subscriptions on this event */
 		sub_prev = NULL;
-		sub_next = NULL;
-		for ( sub=ev->subs ; sub ; sub_prev=sub,
-								sub=sub_next?sub_next:(sub?sub->next:NULL) ) {
+		for ( sub=ev->subs ; sub ; sub_prev=sub, sub=sub_next ) {
+			sub_next = sub->next;
 
 			/* skip valid and non WAIT subscriptions */
-			if ( (sub->flags&EBR_SUBS_TYPE_WAIT)==0 || sub->expire>my_time ) {
-				sub_next = sub->next;
+			if ( (sub->flags&EBR_SUBS_TYPE_WAIT)==0 || sub->expire>my_time )
 				continue;
-			}
 
 			LM_DBG("subscription type [%s] from process %d(pid %d) on "
 				"event <%.*s> expired at %d, now %d\n",
@@ -672,7 +661,6 @@ void ebr_timeout(unsigned int ticks, void* param)
 			job =(ebr_ipc_job*)shm_malloc( sizeof(ebr_ipc_job) );
 			if (job==NULL) {
 				LM_ERR("failed to allocated new IPC job, skipping..\n");
-				sub_next = sub->next;
 				continue; /* with the next subscription */
 			}
 			job->ev = ev;
@@ -685,12 +673,9 @@ void ebr_timeout(unsigned int ticks, void* param)
 			if (ipc_send_job( sub->proc_no, ebr_ipc_type , (void*)job)<0) {
 				LM_ERR("failed to send job via IPC, skipping...\n");
 				shm_free(job);
-				sub_next = sub->next;
 				continue; /* with the next subscription */
 			}
 
-			/* remove the subscription */
-			sub_next = sub->next;
 			/* unlink it */
 			if (sub_prev) sub_prev->next = sub_next;
 			else ev->subs = sub_next;