summaryrefslogtreecommitdiffstats
path: root/src/udev/udevadm-hwdb.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-02-13 14:45:51 +0100
committerLennart Poettering <lennart@poettering.net>2014-02-13 14:45:51 +0100
commit955d98c9c1104d469c2989dbfb58f58ee6fe9bdc (patch)
tree6964487e69bfefbbb08b0de140c67c6f2a00d791 /src/udev/udevadm-hwdb.c
parentnspawn: check with udev before we take possession of an interface (diff)
downloadsystemd-955d98c9c1104d469c2989dbfb58f58ee6fe9bdc.tar.xz
systemd-955d98c9c1104d469c2989dbfb58f58ee6fe9bdc.zip
everywhere: make use of new0() and macro() macros, and stop using perror()
Diffstat (limited to 'src/udev/udevadm-hwdb.c')
-rw-r--r--src/udev/udevadm-hwdb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c
index a22de1da4d..16abbe8d2f 100644
--- a/src/udev/udevadm-hwdb.c
+++ b/src/udev/udevadm-hwdb.c
@@ -190,7 +190,7 @@ static int trie_insert(struct trie *trie, struct trie_node *node, const char *se
continue;
/* split node */
- new_child = calloc(sizeof(struct trie_node), 1);
+ new_child = new0(struct trie_node, 1);
if (!new_child)
return -ENOMEM;
@@ -233,7 +233,7 @@ static int trie_insert(struct trie *trie, struct trie_node *node, const char *se
ssize_t off;
/* new child */
- child = calloc(sizeof(struct trie_node), 1);
+ child = new0(struct trie_node, 1);
if (!child)
return -ENOMEM;
@@ -576,7 +576,7 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) {
char **files, **f;
_cleanup_free_ char *hwdb_bin = NULL;
- trie = calloc(sizeof(struct trie), 1);
+ trie = new0(struct trie, 1);
if (!trie) {
rc = EXIT_FAILURE;
goto out;
@@ -590,7 +590,7 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) {
}
/* index */
- trie->root = calloc(sizeof(struct trie_node), 1);
+ trie->root = new0(struct trie_node, 1);
if (!trie->root) {
rc = EXIT_FAILURE;
goto out;