diff options
| author | Sami Kerola | 2012-02-29 15:54:24 +0100 |
|---|---|---|
| committer | Sami Kerola | 2012-03-18 14:28:05 +0100 |
| commit | 6f312c89578be7b8d0a47c75a4de4cc8c190e40e (patch) | |
| tree | cde8876c4831c709bc210455bccd0b70aa2e1b52 /sys-utils | |
| parent | include: add asprintf wrapper (diff) | |
| download | kernel-qcow2-util-linux-6f312c89578be7b8d0a47c75a4de4cc8c190e40e.tar.gz kernel-qcow2-util-linux-6f312c89578be7b8d0a47c75a4de4cc8c190e40e.tar.xz kernel-qcow2-util-linux-6f312c89578be7b8d0a47c75a4de4cc8c190e40e.zip | |
xalloc: use xasprintf in all files
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'sys-utils')
| -rw-r--r-- | sys-utils/lscpu.c | 2 | ||||
| -rw-r--r-- | sys-utils/mount.c | 2 | ||||
| -rw-r--r-- | sys-utils/prlimit.c | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c index 3cdd76704..6e17b2eb5 100644 --- a/sys-utils/lscpu.c +++ b/sys-utils/lscpu.c @@ -543,7 +543,7 @@ read_hypervisor(struct lscpu_desc *desc) str = strchr(buf, ':'); if (!str) continue; - if (asprintf(&str, "%s", str + 1) == -1) + if (xasprintf(&str, "%s", str + 1) == -1) errx(EXIT_FAILURE, _("failed to allocate memory")); /* remove leading, trailing and repeating whitespace */ while (*str == ' ') diff --git a/sys-utils/mount.c b/sys-utils/mount.c index 69f536b47..b1a0390d6 100644 --- a/sys-utils/mount.c +++ b/sys-utils/mount.c @@ -769,7 +769,7 @@ int main(int argc, char **argv) case 'U': if (source) errx(MOUNT_EX_USAGE, _("only one <source> may be specified")); - if (asprintf(&srcbuf, "%s=\"%s\"", + if (xasprintf(&srcbuf, "%s=\"%s\"", c == 'L' ? "LABEL" : "UUID", optarg) <= 0) err(MOUNT_EX_SYSERR, _("failed to allocate source buffer")); source = srcbuf; diff --git a/sys-utils/prlimit.c b/sys-utils/prlimit.c index a446187ff..c45b85efb 100644 --- a/sys-utils/prlimit.c +++ b/sys-utils/prlimit.c @@ -228,20 +228,20 @@ static void add_tt_line(struct tt *tt, struct prlimit *l) switch (get_column_id(i)) { case COL_RES: - rc = asprintf(&str, "%s", l->desc->name); + rc = xasprintf(&str, "%s", l->desc->name); break; case COL_HELP: - rc = asprintf(&str, "%s", l->desc->help); + rc = xasprintf(&str, "%s", l->desc->help); break; case COL_SOFT: rc = l->rlim.rlim_cur == RLIM_INFINITY ? - asprintf(&str, "%s", "unlimited") : - asprintf(&str, "%llu", (unsigned long long) l->rlim.rlim_cur); + xasprintf(&str, "%s", "unlimited") : + xasprintf(&str, "%llu", (unsigned long long) l->rlim.rlim_cur); break; case COL_HARD: rc = l->rlim.rlim_max == RLIM_INFINITY ? - asprintf(&str, "%s", "unlimited") : - asprintf(&str, "%llu", (unsigned long long) l->rlim.rlim_max); + xasprintf(&str, "%s", "unlimited") : + xasprintf(&str, "%llu", (unsigned long long) l->rlim.rlim_max); break; case COL_UNITS: str = l->desc->unit ? xstrdup(_(l->desc->unit)) : NULL; |