From 0f8e0c3dd47a764868b6ab093feeebb684aa1c46 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Mon, 10 Jul 2006 19:28:57 +0000 Subject: [PATCH] Explicitly use STAILQ_REMOVE_HEAD() when we know we are removing the head element to avoid confusing Coverity. It's now also easier for humans to parse as well. Found by: Coverity Prevent(tm) CID: 1201 --- sys/kern/kern_linker.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c index 55ad60e2eecb..026d5b660e33 100644 --- a/sys/kern/kern_linker.c +++ b/sys/kern/kern_linker.c @@ -620,9 +620,8 @@ linker_file_unload(linker_file_t file, int flags) free(file->deps, M_LINKER); file->deps = NULL; } - for (cp = STAILQ_FIRST(&file->common); cp; - cp = STAILQ_FIRST(&file->common)) { - STAILQ_REMOVE(&file->common, cp, common_symbol, link); + while ((cp = STAILQ_FIRST(&file->common)) != NULL) { + STAILQ_REMOVE_HEAD(&file->common, link); free(cp, M_LINKER); }