Fixed an incorrect parameter passing to the log function.

Change-Id: I5274fd466e79b7773c4903fcfc17f89b3e5cad53

diff --git a/src/core/service.c b/src/core/service.c
index d422cb2..d400072 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -521,10 +521,10 @@ static int service_verify(Service *s) {
         }
 
         if (s->usb_function_descriptors && !s->usb_function_strings)
-                log_unit_warning(UNIT(s)->id, "Service has USBFunctionDescriptors= setting, but no USBFunctionStrings=. Ignoring.");
+                log_unit_warning(UNIT(s), "Service has USBFunctionDescriptors= setting, but no USBFunctionStrings=. Ignoring.");
 
         if (!s->usb_function_descriptors && s->usb_function_strings)
-                log_unit_warning(UNIT(s)->id, "Service has USBFunctionStrings= setting, but no USBFunctionDescriptors=. Ignoring.");
+                log_unit_warning(UNIT(s), "Service has USBFunctionStrings= setting, but no USBFunctionDescriptors=. Ignoring.");
 
         if (s->runtime_max_usec != USEC_INFINITY && s->type == SERVICE_ONESHOT)
                 log_unit_warning(UNIT(s), "MaxRuntimeSec= has no effect in combination with Type=oneshot. Ignoring.");
@@ -1193,7 +1193,7 @@ static int service_spawn(
                 path_temp = unit_default_cgroup_path(UNIT(s));
 
                 if (cg_check_cgroup_exist(path_temp) < 0) {
-                        log_unit_error(UNIT(s)->id, "CGROUP ERROR! (%s) is already realized but not exists", UNIT(s)->id);
+                        log_unit_error(UNIT(s), "CGROUP ERROR! (%s) is already realized but not exists", UNIT(s)->id);
                         UNIT(s)->cgroup_realized = false;
                         UNIT(s)->cgroup_realized_mask = 0;
                 }

diff --git a/src/core/socket.c b/src/core/socket.c
index 3d5714d..09b52e7 100644 (file)
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -2468,7 +2468,7 @@ static int socket_deserialize_item(Unit *u, const char *key, const char *value,
 
                         if (p) {
                                 if (p->n_auxiliary_fds <= idx)
-                                        log_unit_debug(u->id, "Id of auxiliary fd out of bounds");
+                                        log_unit_debug(u, "Id of auxiliary fd out of bounds");
                                 else
                                         p->auxiliary_fds[idx] = fdset_remove(fds, fd);
                         }