diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:33:32 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:33:32 +0000 |
commit | 8bb05ac73a5b448b339ce0bc8d396c82c459b47f (patch) | |
tree | 1fdda006866bca20d41cb206767ea5241e36852f /sys-utils/swapon-common.c | |
parent | Adding debian version 2.39.3-11. (diff) | |
download | util-linux-8bb05ac73a5b448b339ce0bc8d396c82c459b47f.tar.xz util-linux-8bb05ac73a5b448b339ce0bc8d396c82c459b47f.zip |
Merging upstream version 2.40.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | sys-utils/swapon-common.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/sys-utils/swapon-common.c b/sys-utils/swapon-common.c index bffedec..a4149a5 100644 --- a/sys-utils/swapon-common.c +++ b/sys-utils/swapon-common.c @@ -1,4 +1,16 @@ - +/* + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * Copyright (C) 2012-2023 Karel Zak <kzak@redhat.com> + * + * Original implementation from Linux 0.99, without License and copyright in + * the code. Karel Zak rewrote the code under GPL-2.0-or-later. + */ #include "c.h" #include "nls.h" #include "xalloc.h" @@ -85,7 +97,7 @@ static size_t ulct; void add_label(const char *label) { - llist = xrealloc(llist, (++llct) * sizeof(char *)); + llist = xreallocarray(llist, ++llct, sizeof(char *)); llist[llct - 1] = label; } @@ -101,7 +113,7 @@ size_t numof_labels(void) void add_uuid(const char *uuid) { - ulist = xrealloc(ulist, (++ulct) * sizeof(char *)); + ulist = xreallocarray(ulist, ++ulct, sizeof(char *)); ulist[ulct - 1] = uuid; } |