|
@@ -1,6 +1,3 @@
|
|
|
-From e5bd4c3853fb394edc8cbea17fad82ce23bd0fae Mon Sep 17 00:00:00 2001
|
|
|
-From: Khem Raj <raj.khem@gmail.com>
|
|
|
-Date: Fri, 27 Nov 2020 12:21:32 -0800
|
|
|
Subject: [PATCH 1/2] dbus: Remove unused variabes
|
|
|
|
|
|
This issue is seen when using clang to compile it
|
|
@@ -19,11 +16,13 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
|
src/parse.c | 1 -
|
|
|
3 files changed, 5 deletions(-)
|
|
|
|
|
|
+diff --git a/src/dbus.c b/src/dbus.c
|
|
|
+index 9606fea..8e1ed9d 100644
|
|
|
--- a/src/dbus.c
|
|
|
+++ b/src/dbus.c
|
|
|
-@@ -45,9 +45,6 @@ static int method_apply(sd_bus_message *
|
|
|
-
|
|
|
- static int method_info(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
|
|
|
+@@ -242,9 +242,6 @@ static int
|
|
|
+ method_info(sd_bus_message *m, void *userdata, sd_bus_error *ret_error)
|
|
|
+ {
|
|
|
sd_bus_message *reply = NULL;
|
|
|
- g_autoptr(GError) err = NULL;
|
|
|
- g_autofree gchar *stdout = NULL;
|
|
@@ -31,9 +30,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
|
gint exit_status = 0;
|
|
|
|
|
|
exit_status = sd_bus_message_new_method_return(m, &reply);
|
|
|
+diff --git a/src/networkd.c b/src/networkd.c
|
|
|
+index 7c86cd6..7200740 100644
|
|
|
--- a/src/networkd.c
|
|
|
+++ b/src/networkd.c
|
|
|
-@@ -896,7 +896,6 @@ append_wpa_auth_conf(GString* s, const N
|
|
|
+@@ -897,7 +897,6 @@ append_wpa_auth_conf(GString* s, const NetplanAuthenticationSettings* auth, cons
|
|
|
static void
|
|
|
write_wpa_unit(const NetplanNetDefinition* def, const char* rootdir)
|
|
|
{
|
|
@@ -41,9 +42,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
|
g_autofree gchar *stdouth = NULL;
|
|
|
|
|
|
stdouth = systemd_escape(def->id);
|
|
|
+diff --git a/src/parse.c b/src/parse.c
|
|
|
+index 033c657..faca27f 100644
|
|
|
--- a/src/parse.c
|
|
|
+++ b/src/parse.c
|
|
|
-@@ -1898,7 +1898,6 @@ handle_wireguard_peers(yaml_document_t*
|
|
|
+@@ -1899,7 +1899,6 @@ handle_wireguard_peers(yaml_document_t* doc, yaml_node_t* node, const void* _, G
|
|
|
}
|
|
|
|
|
|
for (yaml_node_item_t *i = node->data.sequence.items.start; i < node->data.sequence.items.top; i++) {
|
|
@@ -51,3 +54,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
|
yaml_node_t *entry = yaml_document_get_node(doc, *i);
|
|
|
assert_type(entry, YAML_MAPPING_NODE);
|
|
|
|
|
|
+--
|
|
|
+2.25.1
|
|
|
+
|