sd-dhcp: option_append - support falling back to 'sname' and 'file'

[elogind.git] / src / core / socket.c

diff --git a/src/core/socket.c b/src/core/socket.c
index d57e7701cae642e1e6db007ee142b9d03c6a48bc..05af8fe9d25e4bee0f4928843bdcf35fe291a0ee 100644 (file)
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -470,8 +470,8 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) {
 
         if (s->control_pid > 0)
                 fprintf(f,
-                        "%sControl PID: %lu\n",
-                        prefix, (unsigned long) s->control_pid);
+                        "%sControl PID: "PID_FMT"\n",
+                        prefix, s->control_pid);
 
         if (s->bind_to_device)
                 fprintf(f,
@@ -678,6 +678,8 @@ static int instance_from_socket(int fd, unsigned nr, char **instance) {
                                 return -ENOMEM;
                 } else
                         return k;
+
+                break;
         }
 
         default:
@@ -1708,7 +1710,7 @@ static int socket_serialize(Unit *u, FILE *f, FDSet *fds) {
         unit_serialize_item_format(u, f, "n-accepted", "%u", s->n_accepted);
 
         if (s->control_pid > 0)
-                unit_serialize_item_format(u, f, "control-pid", "%lu", (unsigned long) s->control_pid);
+                unit_serialize_item_format(u, f, "control-pid", PID_FMT, s->control_pid);
 
         if (s->control_command_id >= 0)
                 unit_serialize_item(u, f, "control-command", socket_exec_command_to_string(s->control_command_id));