Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Swap calloc parameters for -Wcalloc-transposed-args #93

Open
wants to merge 1 commit into
base: stable
Choose a base branch
from
Open

Swap calloc parameters for -Wcalloc-transposed-args #93

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions libcli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ struct cli_command *cli_register_command(struct cli_def *cli, struct cli_command
struct cli_command *c;

if (!command) return NULL;
if (!(c = calloc(sizeof(struct cli_command), 1))) return NULL;
if (!(c = calloc(1, sizeof(struct cli_command)))) return NULL;
c->command_type = CLI_REGULAR_COMMAND;
c->callback = callback;
c->next = NULL;
Expand Down Expand Up @@ -597,7 +597,7 @@ struct cli_def *cli_init() {
struct cli_def *cli;
struct cli_command *c;

if (!(cli = calloc(sizeof(struct cli_def), 1))) return 0;
if (!(cli = calloc(1, sizeof(struct cli_def)))) return 0;

cli->buf_size = 1024;
if (!(cli->buffer = calloc(cli->buf_size, 1))) {
Expand Down Expand Up @@ -1957,7 +1957,7 @@ int cli_match_filter_init(struct cli_def *cli, int argc, char **argv, struct cli
char *search_flags = cli_get_optarg_value(cli, "search_flags", NULL);

filt->filter = cli_match_filter;
filt->data = state = calloc(sizeof(struct cli_match_filter_state), 1);
filt->data = state = calloc(1, sizeof(struct cli_match_filter_state));
if (!state) return CLI_ERROR;

if (!strcmp(cli->pipeline->current_stage->words[0], "include")) {
Expand Down Expand Up @@ -2050,7 +2050,7 @@ int cli_range_filter_init(struct cli_def *cli, int argc, char **argv, struct cli
// from the command line processing and continue

filt->filter = cli_range_filter;
filt->data = state = calloc(sizeof(struct cli_range_filter_state), 1);
filt->data = state = calloc(1, sizeof(struct cli_range_filter_state));
if (state) {
state->from = from;
state->to = to;
Expand Down Expand Up @@ -2087,7 +2087,7 @@ int cli_count_filter_init(struct cli_def *cli, int argc, UNUSED(char **argv), st
}

filt->filter = cli_count_filter;
if (!(filt->data = calloc(sizeof(int), 1))) return CLI_ERROR;
if (!(filt->data = calloc(1, sizeof(int)))) return CLI_ERROR;

return CLI_OK;
}
Expand Down Expand Up @@ -2144,7 +2144,7 @@ struct cli_command *cli_register_filter(struct cli_def *cli, const char *command
struct cli_command *c;

if (!command) return NULL;
if (!(c = calloc(sizeof(struct cli_command), 1))) return NULL;
if (!(c = calloc(1, sizeof(struct cli_command)))) return NULL;

c->command_type = CLI_FILTER_COMMAND;
c->init = init;
Expand Down Expand Up @@ -2256,7 +2256,7 @@ struct cli_optarg *cli_register_optarg(struct cli_command *cmd, const char *name
goto CLEANUP;
}
}
if (!(optarg = calloc(sizeof(struct cli_optarg), 1))) goto CLEANUP;
if (!(optarg = calloc(1, sizeof(struct cli_optarg)))) goto CLEANUP;
if (!(optarg->name = strdup(name))) goto CLEANUP;
if (help && !(optarg->help = strdup(help))) goto CLEANUP;

Expand Down Expand Up @@ -2532,7 +2532,7 @@ struct cli_command *cli_int_register_buildmode_command(struct cli_def *cli, stru
struct cli_command *c;

if (!command) return NULL;
if (!(c = calloc(sizeof(struct cli_command), 1))) return NULL;
if (!(c = calloc(1, sizeof(struct cli_command)))) return NULL;

c->flags = flags;
c->callback = callback;
Expand Down Expand Up @@ -3095,7 +3095,7 @@ int cli_int_execute_pipeline(struct cli_def *cli, struct cli_pipeline *pipeline)
struct cli_pipeline_stage *stage = &pipeline->stage[stage_num];
pipeline->current_stage = stage;
cli->found_optargs = stage->found_optargs;
*filt = calloc(sizeof(struct cli_filter), 1);
*filt = calloc(1, sizeof(struct cli_filter));
if (*filt) {
if ((rc = stage->command->init(cli, stage->num_words, stage->words, *filt) != CLI_OK)) {
break;
Expand Down