return ret;
}
-static int print_prop_help(const struct prop_handler *prop)
-{
- fprintf(stdout, "%-20s%s\n", prop->name, prop->desc);
- return 0;
-}
-
static int dump_prop(const struct prop_handler *prop,
const char *object,
int types,
if (!name_and_help)
ret = prop->handler(type, object, prop->name, NULL);
else
- ret = print_prop_help(prop);
+ printf("%-20s%s\n", prop->name, prop->desc);
}
return ret;
}
{
int ret;
char *type_str = NULL;
- int max_nonopt_args = 0;
+ int max_nonopt_args = 1;
optind = 1;
while (1) {
}
}
- if (object)
- max_nonopt_args++;
if (name)
max_nonopt_args++;
if (value)
}
}
- if (object && optind < argc)
- *object = argv[optind++];
- if (name && optind < argc)
+ *object = argv[optind++];
+ if (optind < argc)
*name = argv[optind++];
- if (value && optind < argc)
+ if (optind < argc)
*value = argv[optind++];
- if (!*types && object && *object) {
+ if (!*types) {
ret = autodetect_object_types(*object, types);
if (ret < 0) {
error("failed to detect object type: %s",
parse_args(argc, argv, cmd_property_get_usage, &types, &object, &name,
NULL, 1);
- if (!object) {
- error("invalid arguments");
- usage(cmd_property_get_usage);
- }
if (name)
ret = setget_prop(types, object, name, NULL);
parse_args(argc, argv, cmd_property_set_usage, &types,
&object, &name, &value, 3);
- if (!object || !name || !value) {
- error("invalid arguments");
- usage(cmd_property_set_usage);
- }
ret = setget_prop(types, object, name, value);
parse_args(argc, argv, cmd_property_list_usage,
&types, &object, NULL, NULL, 1);
- if (!object) {
- error("invalid arguments");
- usage(cmd_property_list_usage);
- }
ret = dump_props(types, object, 1);