Allow passing an ID to journald log driver

The ID has been dropped before this patch, but we can use it to refer a
container ID or anything else identifiable.

Signed-off-by: Sascha Grunert <[email protected]>

src/libcrun/error.c

@@ -236,7 +236,7 @@ libcrun_init_logging (crun_output_handler *new_output_handler, void **new_output
 
         case LOG_TYPE_JOURNALD:
           *new_output_handler = log_write_to_journald;
-          *new_output_handler_arg = NULL;
+          *new_output_handler_arg = (void *) id;
           break;
         }
     }
@@ -310,7 +310,7 @@ log_write_to_syslog (int errno_, const char *msg, int verbosity, void *arg arg_u
 }
 
 void
-log_write_to_journald (int errno_, const char *msg, int verbosity, void *arg arg_unused)
+log_write_to_journald (int errno_, const char *msg, int verbosity, void *id)
 {
   (void) errno_;
   (void) msg;
@@ -330,10 +330,10 @@ log_write_to_journald (int errno_, const char *msg, int verbosity, void *arg arg
       break;
     }
   if (errno_ == 0)
-    sd_journal_send ("PRIORITY=%d", priority, "MESSAGE=%s", msg, "ID=%s", arg, NULL);
+    sd_journal_send ("PRIORITY=%d", priority, "MESSAGE=%s", msg, "ID=%s", id, NULL);
   else
     sd_journal_send ("PRIORITY=%d", priority, "MESSAGE=%s: %s", msg, strerror (errno_), "ID=%s",
-                     arg, NULL);
+                     id, NULL);
 #endif
 }