From f766ec0a168029806346f96c07bcdd16af1f6ea5 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 8 Jan 2024 12:54:43 +0100
Subject: [PATCH] libnm: drop some unnecessary direct_string_allow_empty

"nm_setting_hsr_get_port1" is new API and verify() already enforces that
the strings are not empty. The flag is redundant.

Also drop it from a few other places, where it's redundant.
---
 src/libnm-core-impl/nm-setting-connection.c | 6 ++----
 src/libnm-core-impl/nm-setting-hsr.c        | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/libnm-core-impl/nm-setting-connection.c b/src/libnm-core-impl/nm-setting-connection.c
index 909ddc6acd..892e7d3151 100644
--- a/src/libnm-core-impl/nm-setting-connection.c
+++ b/src/libnm-core-impl/nm-setting-connection.c
@@ -2021,8 +2021,7 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass)
                                        .from_dbus_is_full                = TRUE,
                                        .from_dbus_direct_allow_transform = TRUE),
         NMSettingConnectionPrivate,
-        id,
-        .direct_string_allow_empty = TRUE);
+        id);
 
     /**
      * NMSettingConnection:uuid:
@@ -2065,8 +2064,7 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass)
                                               PROP_UUID,
                                               NM_SETTING_PARAM_FUZZY_IGNORE,
                                               NMSettingConnectionPrivate,
-                                              uuid,
-                                              .direct_string_allow_empty = TRUE);
+                                              uuid);
 
     /**
      * NMSettingConnection:stable-id:
diff --git a/src/libnm-core-impl/nm-setting-hsr.c b/src/libnm-core-impl/nm-setting-hsr.c
index d8b4d89bd8..d9a662b16f 100644
--- a/src/libnm-core-impl/nm-setting-hsr.c
+++ b/src/libnm-core-impl/nm-setting-hsr.c
@@ -209,8 +209,7 @@ nm_setting_hsr_class_init(NMSettingHsrClass *klass)
                                               PROP_PORT1,
                                               NM_SETTING_PARAM_INFERRABLE,
                                               NMSettingHsr,
-                                              _priv.port1,
-                                              .direct_string_allow_empty = TRUE);
+                                              _priv.port1);
 
     /**
       * NMSettingHsr:port2:
@@ -225,8 +224,7 @@ nm_setting_hsr_class_init(NMSettingHsrClass *klass)
                                               PROP_PORT2,
                                               NM_SETTING_PARAM_INFERRABLE,
                                               NMSettingHsr,
-                                              _priv.port2,
-                                              .direct_string_allow_empty = TRUE);
+                                              _priv.port2);
 
     /**
       * NMSettingHsr:multicast-spec: