From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 4 Mar 2024 09:11:53 +0000 (+0100)
Subject: resolved,pcrlock: make a bunch of varlink introspection structures static
X-Git-Tag: v256-rc1~648
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2492c89af08b17e2db2ee882f357dc511f7ed073;p=thirdparty%2Fsystemd.git

resolved,pcrlock: make a bunch of varlink introspection structures static

Not sure why gcc doesn't warn that these have no "extern" definition,
but also aren't static...
---

diff --git a/src/shared/varlink-io.systemd.PCRLock.c b/src/shared/varlink-io.systemd.PCRLock.c
index 3b2c408bc9b..32270eaf9ba 100644
--- a/src/shared/varlink-io.systemd.PCRLock.c
+++ b/src/shared/varlink-io.systemd.PCRLock.c
@@ -12,7 +12,7 @@ static VARLINK_DEFINE_METHOD(
 static VARLINK_DEFINE_METHOD(
                 RemovePolicy);
 
-VARLINK_DEFINE_ERROR(
+static VARLINK_DEFINE_ERROR(
                 NoChange);
 
 VARLINK_DEFINE_INTERFACE(
diff --git a/src/shared/varlink-io.systemd.Resolve.Monitor.c b/src/shared/varlink-io.systemd.Resolve.Monitor.c
index e46d1975d7b..ea21b437fa7 100644
--- a/src/shared/varlink-io.systemd.Resolve.Monitor.c
+++ b/src/shared/varlink-io.systemd.Resolve.Monitor.c
@@ -2,13 +2,13 @@
 
 #include "varlink-io.systemd.Resolve.Monitor.h"
 
-VARLINK_DEFINE_STRUCT_TYPE(
+static VARLINK_DEFINE_STRUCT_TYPE(
                 ResourceKey,
                 VARLINK_DEFINE_FIELD(class, VARLINK_INT, 0),
                 VARLINK_DEFINE_FIELD(type, VARLINK_INT, 0),
                 VARLINK_DEFINE_FIELD(name, VARLINK_STRING, 0));
 
-VARLINK_DEFINE_STRUCT_TYPE(
+static VARLINK_DEFINE_STRUCT_TYPE(
                 ResourceRecord,
                 VARLINK_DEFINE_FIELD_BY_TYPE(key, ResourceKey, 0),
                 VARLINK_DEFINE_FIELD(priority, VARLINK_INT, VARLINK_NULLABLE),
@@ -63,18 +63,18 @@ VARLINK_DEFINE_STRUCT_TYPE(
                 VARLINK_DEFINE_FIELD(target, VARLINK_STRING, VARLINK_NULLABLE),
                 VARLINK_DEFINE_FIELD(params, VARLINK_STRING, VARLINK_NULLABLE|VARLINK_ARRAY));
 
-VARLINK_DEFINE_STRUCT_TYPE(
+static VARLINK_DEFINE_STRUCT_TYPE(
                 ResourceRecordArray,
                 VARLINK_DEFINE_FIELD_BY_TYPE(rr, ResourceRecord, VARLINK_NULLABLE),
                 VARLINK_DEFINE_FIELD(raw, VARLINK_STRING, 0));
 
-VARLINK_DEFINE_STRUCT_TYPE(
+static VARLINK_DEFINE_STRUCT_TYPE(
                 Answer,
                 VARLINK_DEFINE_FIELD_BY_TYPE(rr, ResourceRecord, VARLINK_NULLABLE),
                 VARLINK_DEFINE_FIELD(raw, VARLINK_STRING, 0),
                 VARLINK_DEFINE_FIELD(ifindex, VARLINK_INT, VARLINK_NULLABLE));
 
-VARLINK_DEFINE_METHOD(
+static VARLINK_DEFINE_METHOD(
                 SubscribeQueryResults,
                 /* First reply */
                 VARLINK_DEFINE_OUTPUT(ready, VARLINK_BOOL, VARLINK_NULLABLE),
@@ -89,14 +89,14 @@ VARLINK_DEFINE_METHOD(
                 VARLINK_DEFINE_OUTPUT_BY_TYPE(collectedQuestions, ResourceKey, VARLINK_NULLABLE|VARLINK_ARRAY),
                 VARLINK_DEFINE_OUTPUT_BY_TYPE(answer, Answer, VARLINK_NULLABLE|VARLINK_ARRAY));
 
-VARLINK_DEFINE_STRUCT_TYPE(
+static VARLINK_DEFINE_STRUCT_TYPE(
                 CacheEntry,
                 VARLINK_DEFINE_FIELD_BY_TYPE(key, ResourceKey, 0),
                 VARLINK_DEFINE_FIELD_BY_TYPE(rrs, ResourceRecordArray, VARLINK_NULLABLE|VARLINK_ARRAY),
                 VARLINK_DEFINE_FIELD(type, VARLINK_STRING, VARLINK_NULLABLE),
                 VARLINK_DEFINE_FIELD(until, VARLINK_INT, 0));
 
-VARLINK_DEFINE_STRUCT_TYPE(
+static VARLINK_DEFINE_STRUCT_TYPE(
                 ScopeCache,
                 VARLINK_DEFINE_FIELD(protocol, VARLINK_STRING, 0),
                 VARLINK_DEFINE_FIELD(family, VARLINK_INT, VARLINK_NULLABLE),
@@ -104,11 +104,11 @@ VARLINK_DEFINE_STRUCT_TYPE(
                 VARLINK_DEFINE_FIELD(ifname, VARLINK_STRING, VARLINK_NULLABLE),
                 VARLINK_DEFINE_FIELD_BY_TYPE(cache, CacheEntry, VARLINK_ARRAY));
 
-VARLINK_DEFINE_METHOD(
+static VARLINK_DEFINE_METHOD(
                 DumpCache,
                 VARLINK_DEFINE_OUTPUT_BY_TYPE(dump, ScopeCache, VARLINK_ARRAY));
 
-VARLINK_DEFINE_STRUCT_TYPE(
+static VARLINK_DEFINE_STRUCT_TYPE(
                 ServerState,
                 VARLINK_DEFINE_FIELD(Server, VARLINK_STRING, 0),
                 VARLINK_DEFINE_FIELD(Type, VARLINK_STRING, 0),
@@ -127,11 +127,11 @@ VARLINK_DEFINE_STRUCT_TYPE(
                 VARLINK_DEFINE_FIELD(PacketInvalid, VARLINK_BOOL, 0),
                 VARLINK_DEFINE_FIELD(PacketDoOff, VARLINK_BOOL, 0));
 
-VARLINK_DEFINE_METHOD(
+static VARLINK_DEFINE_METHOD(
                 DumpServerState,
                 VARLINK_DEFINE_OUTPUT_BY_TYPE(dump, ServerState, VARLINK_ARRAY));
 
-VARLINK_DEFINE_STRUCT_TYPE(
+static VARLINK_DEFINE_STRUCT_TYPE(
                 TransactionStatistics,
                 VARLINK_DEFINE_FIELD(currentTransactions, VARLINK_INT, 0),
                 VARLINK_DEFINE_FIELD(totalTransactions, VARLINK_INT, 0),
@@ -140,26 +140,26 @@ VARLINK_DEFINE_STRUCT_TYPE(
                 VARLINK_DEFINE_FIELD(totalFailedResponses, VARLINK_INT, 0),
                 VARLINK_DEFINE_FIELD(totalFailedResponsesServedStale, VARLINK_INT, 0));
 
-VARLINK_DEFINE_STRUCT_TYPE(
+static VARLINK_DEFINE_STRUCT_TYPE(
                 CacheStatistics,
                 VARLINK_DEFINE_FIELD(size, VARLINK_INT, 0),
                 VARLINK_DEFINE_FIELD(hits, VARLINK_INT, 0),
                 VARLINK_DEFINE_FIELD(misses, VARLINK_INT, 0));
 
-VARLINK_DEFINE_STRUCT_TYPE(
+static VARLINK_DEFINE_STRUCT_TYPE(
                 DnssecStatistics,
                 VARLINK_DEFINE_FIELD(secure, VARLINK_INT, 0),
                 VARLINK_DEFINE_FIELD(insecure, VARLINK_INT, 0),
                 VARLINK_DEFINE_FIELD(bogus, VARLINK_INT, 0),
                 VARLINK_DEFINE_FIELD(indeterminate, VARLINK_INT, 0));
 
-VARLINK_DEFINE_METHOD(
+static VARLINK_DEFINE_METHOD(
                 DumpStatistics,
                 VARLINK_DEFINE_OUTPUT_BY_TYPE(transactions, TransactionStatistics, 0),
                 VARLINK_DEFINE_OUTPUT_BY_TYPE(cache, CacheStatistics, 0),
                 VARLINK_DEFINE_OUTPUT_BY_TYPE(dnssec, DnssecStatistics, 0));
 
-VARLINK_DEFINE_METHOD(ResetStatistics);
+static VARLINK_DEFINE_METHOD(ResetStatistics);
 
 VARLINK_DEFINE_INTERFACE(
                 io_systemd_Resolve_Monitor,