From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Tue, 27 Jan 2026 10:45:53 +0000 (+0100)
Subject: Consistent naming
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2986e2f209f6ad02496633ceafb03961b4f00b14;p=thirdparty%2Fpdns.git

Consistent naming

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>
---

diff --git a/pdns/sdig.cc b/pdns/sdig.cc
index cbdd0f94b7..de8ba692e7 100644
--- a/pdns/sdig.cc
+++ b/pdns/sdig.cc
@@ -387,19 +387,19 @@ try {
             exit(EXIT_FAILURE);
           }
 
-          std::string spanidStr;
+          std::string spanIDStr;
           if (traceIDStr.size() > traceid.size()) {
-            spanidStr = std::string(traceIDStr.begin() + traceid.size(), traceIDStr.end());
+            spanIDStr = std::string(traceIDStr.begin() + traceid.size(), traceIDStr.end());
           }
           traceIDStr.resize(traceid.size());
           pdns::trace::fill(traceid, traceIDStr);
-          if (spanidStr.empty()) {
+          if (spanIDStr.empty()) {
             spanid.makeRandom();
-          } else if (spanidStr.size() != spanid.size()) {
-            cerr << "spanid size must be " << spanid.size()<< " bytes, but is " << spanidStr.size() << endl;
+          } else if (spanIDStr.size() != spanid.size()) {
+            cerr << "spanid size must be " << spanid.size()<< " bytes, but is " << spanIDStr.size() << endl;
             exit(EXIT_FAILURE);
           } else {
-            pdns::trace::fill(spanid, spanidStr);
+            pdns::trace::fill(spanid, spanIDStr);
           }
         }
         otdata = std::make_tuple(traceid, spanid, traceflags);