chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bootchart: Remove unneeded check for NULL
[elogind.git]
/
src
/
bootchart
/
bootchart.c
diff --git
a/src/bootchart/bootchart.c
b/src/bootchart/bootchart.c
index 8be5a27afa3511aaa34247ec05e0aa385e9544e0..27fd505929f96ec1c0579f52968d7f76f95d3f91 100644
(file)
--- a/
src/bootchart/bootchart.c
+++ b/
src/bootchart/bootchart.c
@@
-3,7
+3,7
@@
/***
This file is part of systemd.
/***
This file is part of systemd.
- Copyright (C) 2009-2013 Intel Co
pr
oration
+ Copyright (C) 2009-2013 Intel Co
rp
oration
Authors:
Auke Kok <auke-jan.h.kok@intel.com>
Authors:
Auke Kok <auke-jan.h.kok@intel.com>
@@
-234,8
+234,7
@@
static int parse_args(int argc, char *argv[]) {
return 0;
}
return 0;
}
-static void do_journal_append(char *file)
-{
+static void do_journal_append(char *file) {
struct iovec iovec[5];
int r, f, j = 0;
ssize_t n;
struct iovec iovec[5];
int r, f, j = 0;
ssize_t n;
@@
-254,7
+253,7
@@
static void do_journal_append(char *file)
p = malloc(9 + BOOTCHART_MAX);
if (!p) {
p = malloc(9 + BOOTCHART_MAX);
if (!p) {
-
r =
log_oom();
+ log_oom();
return;
}
return;
}
@@
-262,12
+261,12
@@
static void do_journal_append(char *file)
f = open(file, O_RDONLY);
if (f < 0) {
f = open(file, O_RDONLY);
if (f < 0) {
- log_error("Failed to read bootchart data: %m
\n
");
+ log_error("Failed to read bootchart data: %m");
return;
}
n = loop_read(f, p + 10, BOOTCHART_MAX, false);
if (n < 0) {
return;
}
n = loop_read(f, p + 10, BOOTCHART_MAX, false);
if (n < 0) {
- log_error("Failed to read bootchart data: %s
\n
", strerror(-n));
+ log_error("Failed to read bootchart data: %s", strerror(-n));
close(f);
return;
}
close(f);
return;
}
@@
-332,7
+331,7
@@
int main(int argc, char *argv[]) {
log_uptime();
log_uptime();
- LIST_HEAD_INIT(
struct list_sample_data,
head);
+ LIST_HEAD_INIT(head);
/* main program loop */
for (samples = 0; !exiting && samples < arg_samples_len; samples++) {
/* main program loop */
for (samples = 0; !exiting && samples < arg_samples_len; samples++) {
@@
-406,7
+405,7
@@
int main(int argc, char *argv[]) {
/* calculate how many samples we lost and scrap them */
arg_samples_len -= (int)(newint_ns / interval);
}
/* calculate how many samples we lost and scrap them */
arg_samples_len -= (int)(newint_ns / interval);
}
- LIST_PREPEND(
struct list_sample_data,
link, head, sampledata);
+ LIST_PREPEND(link, head, sampledata);
}
/* do some cleanup, close fd's */
}
/* do some cleanup, close fd's */