aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@online.no>2024-04-18 12:26:38 +0200
committerTor Egge <Tor.Egge@online.no>2024-04-18 12:26:38 +0200
commitee5602a23a3ba50c2c7f089f85cb78bd1c61eaa7 (patch)
treee6fcab0017db432d0064fa8d2f8e9e6beb9e4a0c
parent649bc559f5f465c789add49634925239510a06c2 (diff)
Add variable-length array comments.
-rw-r--r--fbench/src/test/filereader.cpp2
-rw-r--r--searchlib/src/tests/aggregator/perdocexpr_test.cpp1
-rw-r--r--searchlib/src/vespa/searchlib/predicate/predicate_range_term_expander.h1
-rw-r--r--vespamalloc/src/vespamalloc/util/callstack.cpp1
4 files changed, 4 insertions, 1 deletions
diff --git a/fbench/src/test/filereader.cpp b/fbench/src/test/filereader.cpp
index 87c5914e85b..b2061633d41 100644
--- a/fbench/src/test/filereader.cpp
+++ b/fbench/src/test/filereader.cpp
@@ -66,7 +66,7 @@ main(int argc, char **argv)
return -1;
}
int res;
- int buflen = 10240;
+ constexpr int buflen = 10240;
char buf[buflen];
while ((res = reader->ReadLine(buf, buflen - 1)) >= 0) {
// printf("len=%d, content:>%s<\n", res, buf);
diff --git a/searchlib/src/tests/aggregator/perdocexpr_test.cpp b/searchlib/src/tests/aggregator/perdocexpr_test.cpp
index 908e50ad4d2..e9f0981739c 100644
--- a/searchlib/src/tests/aggregator/perdocexpr_test.cpp
+++ b/searchlib/src/tests/aggregator/perdocexpr_test.cpp
@@ -604,6 +604,7 @@ getVespaChecksumV2(const std::string& ymumid, int fid, const std::string& flags_
sizeof(networkFid)+
new_flags_str.length();
+ // GNU extension: Variable-length automatic array
unsigned char buffer[length];
memset(buffer, 0x00, length);
memcpy(buffer, ymumid.c_str(), ymumid.length());
diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_range_term_expander.h b/searchlib/src/vespa/searchlib/predicate/predicate_range_term_expander.h
index 7ff796e5b7d..8159d5c4147 100644
--- a/searchlib/src/vespa/searchlib/predicate/predicate_range_term_expander.h
+++ b/searchlib/src/vespa/searchlib/predicate/predicate_range_term_expander.h
@@ -50,6 +50,7 @@ void PredicateRangeTermExpander::expand(const vespalib::string &key, int64_t sig
return;
}
size_t buffer_size = 21 * 2 + 3 + key.size(); // 2 numbers + punctuation + key
+ // GNU extension: Variable-length automatic array
char buffer[buffer_size];
int size;
int prefix_size = snprintf(buffer, buffer_size, "%s=", key.c_str());
diff --git a/vespamalloc/src/vespamalloc/util/callstack.cpp b/vespamalloc/src/vespamalloc/util/callstack.cpp
index a0645f06815..b8449c89a72 100644
--- a/vespamalloc/src/vespamalloc/util/callstack.cpp
+++ b/vespamalloc/src/vespamalloc/util/callstack.cpp
@@ -53,6 +53,7 @@ const void * StackEntry::_stopAddr = nullptr;
size_t
StackEntry::fillStack(StackEntry *stack, size_t nelems)
{
+ // GNU extension: Variable-length automatic array
void * retAddr[nelems];
int sz = backtrace(retAddr, nelems);
if ((sz > 0) && (size_t(sz) <= nelems)) {