cmd: update to use new object system

This commit is contained in:
2025-10-19 21:02:12 +01:00
parent fd04a49d84
commit 34c54eb545
7 changed files with 36 additions and 41 deletions

View File

@@ -315,9 +315,9 @@ b_status b_command_usage_add_command(b_command_usage *usage, unsigned int cmd_id
static void prepend_command_name(struct b_command *cmd, b_string *out)
{
int nr_names = 0;
cmd->b_name &&nr_names++;
cmd->b_long_name &&nr_names++;
cmd->b_short_name &&nr_names++;
cmd->b_name&& nr_names++;
cmd->b_long_name&& nr_names++;
cmd->b_short_name&& nr_names++;
if (nr_names > 1) {
b_string_prepend_cstr(out, "}");
@@ -380,7 +380,7 @@ static void get_usage_string(
{
get_qualified_command_name(cmd, args, out);
struct b_string *cmd_name = b_string_create();
b_string *cmd_name = b_string_create();
b_queue_iterator it;
b_queue_foreach (&it, &usage->u_parts) {
@@ -428,7 +428,7 @@ static void get_usage_string(
}
}
b_string_release(cmd_name);
b_string_unref(cmd_name);
}
b_string *z__b_command_default_usage_string(
@@ -611,8 +611,8 @@ static void print_options_list(struct b_command *cmd)
}
}
b_string_release(opt_str);
b_string_release(desc_str);
b_string_unref(opt_str);
b_string_unref(desc_str);
}
static void print_args_list(struct b_command *cmd)
@@ -668,7 +668,7 @@ static void print_args_list(struct b_command *cmd)
b_print_paragraph(b_string_ptr(str), OUTPUT_STREAM, &format);
}
b_string_release(str);
b_string_unref(str);
}
static void print_commands_list(struct b_command *cmd)
@@ -724,7 +724,7 @@ static void print_commands_list(struct b_command *cmd)
b_print_paragraph(b_string_ptr(str), OUTPUT_STREAM, &format);
}
b_string_release(str);
b_string_unref(str);
}
struct b_command *b_command_get_subcommand_with_name(
@@ -871,7 +871,7 @@ static void print_usage(struct b_command *cmd, struct b_arglist *args)
b_string *usage
= z__b_command_default_usage_string(cmd, NULL, args);
b_print_paragraph(b_string_ptr(usage), OUTPUT_STREAM, &format);
b_string_release(usage);
b_string_unref(usage);
return;
}
@@ -889,7 +889,7 @@ static void print_usage(struct b_command *cmd, struct b_arglist *args)
b_print_paragraph(b_string_ptr(str), OUTPUT_STREAM, &format);
}
b_string_release(str);
b_string_unref(str);
}
static void print_help(struct b_command *cmd, struct b_arglist *args)