Skip to content

Commit 955d98c

Browse files
poetteringpoettering
committed
everywhere: make use of new0() and macro() macros, and stop using perror()
1 parent 7e22702 commit 955d98c

File tree

16 files changed

+38
-39
lines changed

16 files changed

+38
-39
lines changed

‎src/bootchart/bootchart.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -318,10 +318,10 @@ int main(int argc, char *argv[]) {
318318
(void) setrlimit(RLIMIT_NOFILE, &rlim);
319319

320320
/* start with empty ps LL */
321-
ps_first = calloc(1, sizeof(struct ps_struct));
321+
ps_first = new0(struct ps_struct, 1);
322322
if (!ps_first) {
323-
perror("calloc(ps_struct)");
324-
exit(EXIT_FAILURE);
323+
log_oom();
324+
return EXIT_FAILURE;
325325
}
326326

327327
/* handle TERM/INT nicely */
@@ -397,8 +397,8 @@ int main(int argc, char *argv[]) {
397397
/* caught signal, probably HUP! */
398398
break;
399399
}
400-
perror("nanosleep()");
401-
exit (EXIT_FAILURE);
400+
log_error("nanosleep() failed: %m");
401+
exit(EXIT_FAILURE);
402402
}
403403
} else {
404404
overrun++;

‎src/bootchart/store.c‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,6 @@ void log_sample(int sample, struct list_sample_data **ptr) {
132132
struct list_sample_data *sampledata;
133133
struct ps_sched_struct *ps_prev = NULL;
134134

135-
136-
137135
sampledata = *ptr;
138136

139137
/* all the per-process stuff goes here */
@@ -151,8 +149,8 @@ void log_sample(int sample, struct list_sample_data **ptr) {
151149
/* block stuff */
152150
vmstat = openat(procfd, "vmstat", O_RDONLY);
153151
if (vmstat == -1) {
154-
perror("open /proc/vmstat");
155-
exit (EXIT_FAILURE);
152+
log_error("Failed to open /proc/vmstat: %m");
153+
exit(EXIT_FAILURE);
156154
}
157155
}
158156

@@ -183,8 +181,8 @@ void log_sample(int sample, struct list_sample_data **ptr) {
183181
/* overall CPU utilization */
184182
schedstat = openat(procfd, "schedstat", O_RDONLY);
185183
if (schedstat == -1) {
186-
perror("open /proc/schedstat");
187-
exit (EXIT_FAILURE);
184+
log_error("Failed to open /proc/schedstat: %m");
185+
exit(EXIT_FAILURE);
188186
}
189187
}
190188

@@ -257,17 +255,17 @@ void log_sample(int sample, struct list_sample_data **ptr) {
257255
char t[32];
258256
struct ps_struct *parent;
259257

260-
ps->next_ps = calloc(1, sizeof(struct ps_struct));
258+
ps->next_ps = new0(struct ps_struct, 1);
261259
if (!ps->next_ps) {
262-
perror("calloc(ps_struct)");
260+
log_oom();
263261
exit (EXIT_FAILURE);
264262
}
265263
ps = ps->next_ps;
266264
ps->pid = pid;
267265

268-
ps->sample = calloc(1, sizeof(struct ps_sched_struct));
266+
ps->sample = new0(struct ps_sched_struct, 1);
269267
if (!ps->sample) {
270-
perror("calloc(ps_struct)");
268+
log_oom();
271269
exit (EXIT_FAILURE);
272270
}
273271
ps->sample->sampledata = sampledata;
@@ -393,10 +391,10 @@ void log_sample(int sample, struct list_sample_data **ptr) {
393391
if (!sscanf(buf, "%s %s %*s", rt, wt))
394392
continue;
395393

396-
ps->sample->next = calloc(1, sizeof(struct ps_sched_struct));
394+
ps->sample->next = new0(struct ps_sched_struct, 1);
397395
if (!ps->sample) {
398-
perror("calloc(ps_struct)");
399-
exit (EXIT_FAILURE);
396+
log_oom();
397+
exit(EXIT_FAILURE);
400398
}
401399
ps->sample->next->prev = ps->sample;
402400
ps->sample = ps->sample->next;

‎src/libudev/libudev-device.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ struct udev_device *udev_device_new(struct udev *udev)
647647
if (udev == NULL)
648648
return NULL;
649649

650-
udev_device = calloc(1, sizeof(struct udev_device));
650+
udev_device = new0(struct udev_device, 1);
651651
if (udev_device == NULL)
652652
return NULL;
653653
udev_device->refcount = 1;

‎src/libudev/libudev-enumerate.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ _public_ struct udev_enumerate *udev_enumerate_new(struct udev *udev)
8383

8484
if (udev == NULL)
8585
return NULL;
86-
udev_enumerate = calloc(1, sizeof(struct udev_enumerate));
86+
udev_enumerate = new0(struct udev_enumerate, 1);
8787
if (udev_enumerate == NULL)
8888
return NULL;
8989
udev_enumerate->refcount = 1;

‎src/libudev/libudev-list.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ struct udev_list_entry *udev_list_entry_add(struct udev_list *list, const char *
165165
}
166166

167167
/* add new name */
168-
entry = calloc(1, sizeof(struct udev_list_entry));
168+
entry = new0(struct udev_list_entry, 1);
169169
if (entry == NULL)
170170
return NULL;
171171
entry->name = strdup(name);

‎src/libudev/libudev-monitor.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ static struct udev_monitor *udev_monitor_new(struct udev *udev)
9696
{
9797
struct udev_monitor *udev_monitor;
9898

99-
udev_monitor = calloc(1, sizeof(struct udev_monitor));
99+
udev_monitor = new0(struct udev_monitor, 1);
100100
if (udev_monitor == NULL)
101101
return NULL;
102102
udev_monitor->refcount = 1;

‎src/libudev/libudev-queue-private.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ struct udev_queue_export *udev_queue_export_new(struct udev *udev)
7979
if (udev == NULL)
8080
return NULL;
8181

82-
udev_queue_export = calloc(1, sizeof(struct udev_queue_export));
82+
udev_queue_export = new0(struct udev_queue_export, 1);
8383
if (udev_queue_export == NULL)
8484
return NULL;
8585
udev_queue_export->udev = udev;
@@ -162,7 +162,7 @@ static struct queue_devpaths *build_index(struct udev_queue_export *udev_queue_e
162162
udev_err(udev_queue_export->udev, "queue file overflow\n");
163163
return NULL;
164164
}
165-
devpaths = calloc(1, sizeof(struct queue_devpaths) + (range + 1) * sizeof(long));
165+
devpaths = malloc0(sizeof(struct queue_devpaths) + (range + 1) * sizeof(long));
166166
if (devpaths == NULL)
167167
return NULL;
168168
devpaths->devpaths_size = range + 1;

‎src/libudev/libudev-queue.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ _public_ struct udev_queue *udev_queue_new(struct udev *udev)
6969
if (udev == NULL)
7070
return NULL;
7171

72-
udev_queue = calloc(1, sizeof(struct udev_queue));
72+
udev_queue = new0(struct udev_queue, 1);
7373
if (udev_queue == NULL)
7474
return NULL;
7575
udev_queue->refcount = 1;

‎src/libudev/libudev-util.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ int util_resolve_subsys_kernel(struct udev *udev, const char *string,
203203
udev_device_unref(dev);
204204
return 0;
205205
}
206+
206207
ssize_t util_get_sys_core_link_value(struct udev *udev, const char *slink, const char *syspath, char *value, size_t size)
207208
{
208209
char path[UTIL_PATH_SIZE];
@@ -417,7 +418,7 @@ uint64_t util_string_bloom64(const char *str)
417418

418419
ssize_t print_kmsg(const char *fmt, ...)
419420
{
420-
int fd;
421+
_cleanup_close_ int fd = -1;
421422
va_list ap;
422423
char text[1024];
423424
ssize_t len;
@@ -435,7 +436,7 @@ ssize_t print_kmsg(const char *fmt, ...)
435436

436437
ret = write(fd, text, len);
437438
if (ret < 0)
438-
ret = -errno;
439-
close(fd);
439+
return -errno;
440+
440441
return ret;
441442
}

‎src/libudev/libudev.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ _public_ struct udev *udev_new(void)
121121
const char *env;
122122
FILE *f;
123123

124-
udev = calloc(1, sizeof(struct udev));
124+
udev = new0(struct udev, 1);
125125
if (udev == NULL)
126126
return NULL;
127127
udev->refcount = 1;

0 commit comments

Comments
 (0)