Module Name: src
Committed By: nia
Date: Sat Oct 30 09:06:34 UTC 2021
Modified Files:
src/lib/librefuse: refuse_opt.c
Log Message:
refuse(3): Simplify reallocation logic with reallocarr.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/lib/librefuse/refuse_opt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librefuse/refuse_opt.c
diff -u src/lib/librefuse/refuse_opt.c:1.18 src/lib/librefuse/refuse_opt.c:1.19
--- src/lib/librefuse/refuse_opt.c:1.18 Wed Nov 16 16:11:42 2016
+++ src/lib/librefuse/refuse_opt.c Sat Oct 30 09:06:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: refuse_opt.c,v 1.18 2016/11/16 16:11:42 pho Exp $ */
+/* $NetBSD: refuse_opt.c,v 1.19 2021/10/30 09:06:34 nia Exp $ */
/*-
* Copyright (c) 2007 Juan Romero Pardines.
@@ -58,13 +58,11 @@ fuse_opt_add_arg(struct fuse_args *args,
args->allocated = ap->allocated;
(void) free(ap);
} else if (args->allocated == args->argc) {
- void *a;
int na = args->allocated + 10;
- if ((a = realloc(args->argv, na * sizeof(*args->argv))) == NULL)
+ if (reallocarr(&args->argv, na, sizeof(*args->argv)) != 0)
return -1;
- args->argv = a;
args->allocated = na;
}
DPRINTF(("%s: arguments passed: [arg:%s]\n", __func__, arg));
@@ -119,22 +117,18 @@ fuse_opt_insert_arg(struct fuse_args *ar
{
int i;
int na;
- void *a;
DPRINTF(("%s: arguments passed: [pos=%d] [arg=%s]\n",
__func__, pos, arg));
if (args->argv == NULL) {
na = 10;
- a = malloc(na * sizeof(*args->argv));
} else {
na = args->allocated + 10;
- a = realloc(args->argv, na * sizeof(*args->argv));
}
- if (a == NULL) {
+ if (reallocarr(&args->argv, na, sizeof(*args->argv)) != 0) {
warn("fuse_opt_insert_arg");
return -1;
}
- args->argv = a;
args->allocated = na;
for (i = args->argc++; i > pos; --i) {
