resolve: several trivial cleanups for dnssd

- make several functions static,
- add serveral missing assertions,
- several coding style cleanups.

src/resolve/resolved-dnssd.c

@@ -27,7 +27,7 @@
 
 #define DNSSD_SERVICE_DIRS ((const char* const*) CONF_PATHS_STRV("systemd/dnssd"))
 
-DnssdTxtData *dnssd_txtdata_free(DnssdTxtData *txt_data) {
+DnssdTxtData* dnssd_txtdata_free(DnssdTxtData *txt_data) {
         if (!txt_data)
                 return NULL;
 
@@ -37,7 +37,7 @@ DnssdTxtData *dnssd_txtdata_free(DnssdTxtData *txt_data) {
         return mfree(txt_data);
 }
 
-DnssdTxtData *dnssd_txtdata_free_all(DnssdTxtData *txt_data) {
+static DnssdTxtData* dnssd_txtdata_free_all(DnssdTxtData *txt_data) {
         DnssdTxtData *next;
 
         if (!txt_data)
@@ -50,7 +50,7 @@ DnssdTxtData *dnssd_txtdata_free_all(DnssdTxtData *txt_data) {
         return dnssd_txtdata_free_all(next);
 }
 
-DnssdRegisteredService *dnssd_registered_service_free(DnssdRegisteredService *service) {
+DnssdRegisteredService* dnssd_registered_service_free(DnssdRegisteredService *service) {
         if (!service)
                 return NULL;
 
@@ -86,6 +86,7 @@ static int dnssd_registered_service_make_goodbye(
                 DnssdRegisteredService *service,
                 DnsScope *scope,
                 DnsAnswer **ret) {
+
         _cleanup_(dns_answer_unrefp) DnsAnswer *answer = NULL;
         size_t n_rrs = 3;
         int r;
@@ -441,10 +442,11 @@ oom:
         return -ENOMEM;
 }
 
-int dnssd_txt_item_new_from_string(const char *key, const char *value, DnsTxtItem **ret_item) {
+static int dnssd_txt_item_new_from_string(const char *key, const char *value, DnsTxtItem **ret_item) {
         size_t length;
         DnsTxtItem *i;
 
+        assert(key);
         assert(ret_item);
 
         length = strlen(key);
@@ -472,6 +474,8 @@ int dnssd_txt_item_new_from_data(const char *key, const void *data, const size_t
         size_t length;
         DnsTxtItem *i;
 
+        assert(key);
+        assert(data || size == 0);
         assert(ret_item);
 
         length = strlen(key);
@@ -499,6 +503,8 @@ int dnssd_signal_conflict(Manager *manager, const char *name) {
         DnssdRegisteredService *s;
         int r;
 
+        assert(manager);
+
         if (sd_bus_is_ready(manager->bus) <= 0)
                 return 0;
 

src/resolve/resolved-dnssd.h

@@ -52,18 +52,17 @@ typedef struct DnssdRegisteredService {
 
 extern const struct hash_ops dnssd_registered_service_hash_ops;
 
-DnssdRegisteredService *dnssd_registered_service_free(DnssdRegisteredService *service);
-void dnssd_registered_service_unregister(DnssdRegisteredService *service);
-DnssdTxtData *dnssd_txtdata_free(DnssdTxtData *txt_data);
-DnssdTxtData *dnssd_txtdata_free_all(DnssdTxtData *txt_data);
-void dnssd_registered_service_clear_on_reload(Hashmap *services);
-
-DEFINE_TRIVIAL_CLEANUP_FUNC(DnssdRegisteredService*, dnssd_registered_service_free);
+DnssdTxtData* dnssd_txtdata_free(DnssdTxtData *txt_data);
 DEFINE_TRIVIAL_CLEANUP_FUNC(DnssdTxtData*, dnssd_txtdata_free);
 
+DnssdRegisteredService* dnssd_registered_service_free(DnssdRegisteredService *service);
+DEFINE_TRIVIAL_CLEANUP_FUNC(DnssdRegisteredService*, dnssd_registered_service_free);
+
+void dnssd_registered_service_unregister(DnssdRegisteredService *service);
+void dnssd_registered_service_clear_on_reload(Hashmap *services);
+
 int dnssd_render_instance_name(Manager *m, DnssdRegisteredService *s, char **ret);
 int dnssd_load(Manager *manager);
-int dnssd_txt_item_new_from_string(const char *key, const char *value, DnsTxtItem **ret_item);
 int dnssd_txt_item_new_from_data(const char *key, const void *data, size_t size, DnsTxtItem **ret_item);
 int dnssd_update_rrs(DnssdRegisteredService *s);
 int dnssd_signal_conflict(Manager *manager, const char *name);