Wrap needless returns in a macro that declares them as such, so that

I can tell FlexeLint to ignore them.



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@4217 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/cache.h

@@ -753,3 +753,4 @@ ObjIsBusy(const struct object *o)
 	CHECK_OBJ_NOTNULL(o->objcore, OBJCORE_MAGIC);
 	return (o->objcore->flags & OC_F_BUSY);
 }
+

bin/varnishd/cache_acceptor.c

@@ -268,7 +268,7 @@ vca_acct(void *arg)
 			WRK_QueueSession(sp);
 		}
 	}
-	return NULL;
+	NEEDLESS_RETURN(NULL);
 }
 
 /*--------------------------------------------------------------------*/

bin/varnishd/cache_ban.c

@@ -550,7 +550,7 @@ ban_lurker(struct sess *sp, void *priv)
 		HSH_Deref(sp->wrk, &o);
 		TIM_sleep(params->ban_lurker_sleep);
 	}
-	return NULL;
+	NEEDLESS_RETURN(NULL);
 }
 
 

bin/varnishd/cache_expire.c

@@ -296,7 +296,7 @@ exp_timer(struct sess *sp, void *priv)
 			HSH_DerefObjCore(sp);
 		}
 	}
-	return NULL;
+	NEEDLESS_RETURN(NULL);
 }
 
 /*--------------------------------------------------------------------

bin/varnishd/cache_pool.c

@@ -424,7 +424,7 @@ wrk_herdtimer_thread(void *priv)
 
 		TIM_sleep(params->wthread_purge_delay * 1e-3);
 	}
-	return NULL;
+	NEEDLESS_RETURN(NULL);
 }
 
 /*--------------------------------------------------------------------
@@ -497,7 +497,7 @@ wrk_herder_thread(void *priv)
 			wrk_breed_flock(wq[u]);
 		}
 	}
-	return NULL;
+	NEEDLESS_RETURN(NULL);
 }
 
 /*--------------------------------------------------------------------
@@ -535,7 +535,7 @@ wrk_bgthread(void *arg)
 
 	WRONG("BgThread terminated");
 
-	return (NULL);
+	NEEDLESS_RETURN(NULL);
 }
 
 void

bin/varnishd/cache_waiter_poll.c

@@ -152,7 +152,7 @@ vca_main(void *arg)
 			SES_Delete(sp);
 		}
 	}
-	return NULL;
+	NEEDLESS_RETURN(NULL);
 }
 
 /*--------------------------------------------------------------------*/

bin/varnishd/common.h

@@ -64,3 +64,5 @@ struct choice {
 	const char      *name;
 	void            *ptr;
 };
+
+#define NEEDLESS_RETURN(foo) 	return (foo)

bin/varnishd/flint.lnt

@@ -55,6 +55,7 @@
 -efile(766, ../../config.h)
 -emacro(413, offsetof)	// likely null pointer
 -emacro(527, WRONG)	// unreachable code
+-emacro(527, NEEDLESS_RETURN)	// unreachable code
 
 -emacro(702, WEXITSTATUS)	// signed shift right 
 -efunc(525, VCC_Return_Name)	// Negative indent

bin/varnishd/hash_critbit.c

@@ -372,7 +372,7 @@ hcb_cleaner(void *priv)
 		Lck_Unlock(&hcb_mtx);
 		WRK_SumStat(&ww);
 	}
-	return NULL;
+	NEEDLESS_RETURN(NULL);
 }
 
 /**********************************************************************/

bin/varnishd/storage_persistent.c

@@ -997,7 +997,7 @@ smp_thread(struct sess *sp, void *priv)
 	printf("Silo completely loaded\n");
 	while (1)	
 		sleep (1);
-	return (NULL);
+	NEEDLESS_RETURN(NULL);
 }
 
 /*--------------------------------------------------------------------