From 29a72225631b3a5b4cab5f6ee4e9334f4b8b8b93 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Thu, 26 Mar 2020 15:21:51 -0700 Subject: [PATCH] Func::DescribeDebug: move a NumFields() call out of loop --- src/Func.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Func.cc b/src/Func.cc index 58a39922a3..79216fea17 100644 --- a/src/Func.cc +++ b/src/Func.cc @@ -144,19 +144,20 @@ void Func::DescribeDebug(ODesc* d, const zeek::Args* args) const { d->Add(Name()); - RecordType* func_args = FType()->Args(); - if ( args ) { d->Add("("); + RecordType* func_args = FType()->Args(); + auto num_fields = static_cast(func_args->NumFields()); for ( auto i = 0u; i < args->size(); ++i ) { // Handle varargs case (more args than formals). - if ( i >= static_cast(func_args->NumFields()) ) + if ( i >= num_fields ) { d->Add("vararg"); - d->Add(i - func_args->NumFields()); + int va_num = i - num_fields; + d->Add(va_num); } else d->Add(func_args->FieldName(i));