chiark / gitweb /
journal: update comments a bit
[elogind.git] / src / journal / journalctl.c
index bac87294943adf9ef704fdb85287078eff398c14..ec05c160be5523bc37756606710c4b701178f90f 100644 (file)
@@ -150,7 +150,7 @@ static int parse_argv(int argc, char *argv[]) {
                 { "verify",       no_argument,       NULL, ARG_VERIFY       },
                 { "verify-key",   required_argument, NULL, ARG_VERIFY_KEY   },
                 { "disk-usage",   no_argument,       NULL, ARG_DISK_USAGE   },
-                { "cursor",       no_argument,       NULL, 'c'              },
+                { "cursor",       required_argument, NULL, 'c'              },
                 { NULL,           0,                 NULL, 0                }
         };
 
@@ -730,7 +730,6 @@ static int verify(sd_journal *j) {
 int main(int argc, char *argv[]) {
         int r;
         sd_journal *j = NULL;
-        unsigned line = 0;
         bool need_seek = false;
         sd_id128_t previous_boot_id;
         bool previous_boot_id_valid = false;
@@ -904,9 +903,7 @@ int main(int argc, char *argv[]) {
                                 }
                         }
 
-                        line ++;
-
-                        r = output_journal(j, arg_output, line, 0, flags);
+                        r = output_journal(stdout, j, arg_output, 0, flags);
                         if (r < 0)
                                 goto finish;
 
@@ -918,7 +915,7 @@ int main(int argc, char *argv[]) {
 
                 r = sd_journal_wait(j, (uint64_t) -1);
                 if (r < 0) {
-                        log_error("Couldn't wait for log event: %s", strerror(-r));
+                        log_error("Couldn't wait for journal event: %s", strerror(-r));
                         goto finish;
                 }
         }