Module Name: src Committed By: ozaki-r Date: Tue Jul 13 08:04:31 UTC 2021
Modified Files: src/sys/altq: altq_rmclass.h Log Message: altq, cbq: apply the do-while idiom to TV_* macros To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/altq/altq_rmclass.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/altq/altq_rmclass.h diff -u src/sys/altq/altq_rmclass.h:1.8 src/sys/altq/altq_rmclass.h:1.9 --- src/sys/altq/altq_rmclass.h:1.8 Sat Oct 28 11:35:17 2006 +++ src/sys/altq/altq_rmclass.h Tue Jul 13 08:04:31 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: altq_rmclass.h,v 1.8 2006/10/28 11:35:17 peter Exp $ */ +/* $NetBSD: altq_rmclass.h,v 1.9 2021/07/13 08:04:31 ozaki-r Exp $ */ /* $KAME: altq_rmclass.h,v 1.10 2003/08/20 23:30:23 itojun Exp $ */ /* @@ -76,7 +76,7 @@ struct red; #define TV_LT(a, b) (((a)->tv_sec < (b)->tv_sec) || \ (((a)->tv_usec < (b)->tv_usec) && ((a)->tv_sec <= (b)->tv_sec))) -#define TV_DELTA(a, b, delta) { \ +#define TV_DELTA(a, b, delta) do { \ register int xxs; \ \ delta = (a)->tv_usec - (b)->tv_usec; \ @@ -95,9 +95,9 @@ struct red; break; \ } \ } \ -} +} while (0) -#define TV_ADD_DELTA(a, delta, res) { \ +#define TV_ADD_DELTA(a, delta, res) do { \ register int xxus = (a)->tv_usec + (delta); \ \ (res)->tv_sec = (a)->tv_sec; \ @@ -106,7 +106,7 @@ struct red; xxus -= 1000000; \ } \ (res)->tv_usec = xxus; \ -} +} while (0) #define RM_TIMEOUT 2 /* 1 Clock tick. */