diff options
| author | Nicholas Marriott <nicm@openbsd.org> | 2010-02-06 23:22:27 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@openbsd.org> | 2010-02-06 23:22:27 +0000 |
| commit | 46511805037cf33bd9e2c6286e33417d9fd35d1f (patch) | |
| tree | 1eeeeb3e2184b8dd28e011c6402532e396493ad7 /cmd-source-file.c | |
| parent | bb53c20c1882cbc909d4fe2ae3c6ad665da6abf6 (diff) | |
| download | rtmux-46511805037cf33bd9e2c6286e33417d9fd35d1f.tar.gz rtmux-46511805037cf33bd9e2c6286e33417d9fd35d1f.tar.bz2 rtmux-46511805037cf33bd9e2c6286e33417d9fd35d1f.zip | |
Use the array.h code for the causes list.
Diffstat (limited to 'cmd-source-file.c')
| -rw-r--r-- | cmd-source-file.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/cmd-source-file.c b/cmd-source-file.c index 69a27e88..93a0800c 100644 --- a/cmd-source-file.c +++ b/cmd-source-file.c @@ -89,18 +89,18 @@ int cmd_source_file_exec(struct cmd *self, struct cmd_ctx *ctx) { struct cmd_source_file_data *data = self->data; - char **causes; - u_int i, ncauses; - - causes = NULL; - ncauses = 0; - - if (load_cfg(data->path, ctx, &ncauses, &causes) != 0) { - for (i = 0; i < ncauses; i++) { - ctx->print(ctx, "%s", causes[i]); - xfree(causes[i]); + struct causelist causes; + char *cause; + u_int i; + + ARRAY_INIT(&causes); + if (load_cfg(data->path, ctx, &causes) != 0) { + for (i = 0; i < ARRAY_LENGTH(&causes); i++) { + cause = ARRAY_ITEM(&causes, i); + ctx->print(ctx, "%s", cause); + xfree(cause); } - xfree(causes); + ARRAY_FREE(&causes); } return (0); |