summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2024-06-15 23:06:08 +0000
committermidipix <writeonce@midipix.org>2024-06-22 13:40:14 +0000
commit5b97958e0b4bd556d4dd57e9edd88226752d7786 (patch)
tree1b232bda3ebdda26113defb353eb140a224bf656 /src
parenteaa8b9092395a5d90573021932fb35976ae82c45 (diff)
downloadslibtool-5b97958e0b4bd556d4dd57e9edd88226752d7786.tar.bz2
slibtool-5b97958e0b4bd556d4dd57e9edd88226752d7786.tar.xz
argv.h: argv_alloc(): refactor for better readability.
Diffstat (limited to 'src')
-rw-r--r--src/internal/argv/argv.h18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/internal/argv/argv.h b/src/internal/argv/argv.h
index 54fba70..15eef09 100644
--- a/src/internal/argv/argv.h
+++ b/src/internal/argv/argv.h
@@ -750,7 +750,8 @@ static struct argv_meta * argv_alloc(char ** argv, struct argv_ctx * ctx)
if (!(imeta->argv = calloc(argc+1,sizeof(char *))))
return argv_free_impl(imeta);
- else if (!(imeta->strbuf = calloc(1,size+1)))
+
+ if (!(imeta->strbuf = calloc(1,size+1)))
return argv_free_impl(imeta);
for (i=0,dst=imeta->strbuf; i<argc; i++) {
@@ -760,15 +761,18 @@ static struct argv_meta * argv_alloc(char ** argv, struct argv_ctx * ctx)
}
imeta->meta.argv = imeta->argv;
- } else
+ } else {
imeta->meta.argv = argv;
+ }
- if (!(imeta->meta.entries = calloc(
- ctx->nentries+1,
- sizeof(struct argv_entry))))
+ imeta->meta.entries = calloc(
+ ctx->nentries+1,
+ sizeof(struct argv_entry));
+
+ if (!imeta->meta.entries)
return argv_free_impl(imeta);
- else
- return &imeta->meta;
+
+ return &imeta->meta;
}
static struct argv_meta * argv_get(