Code Review
/
src
/
app-framework-main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add comments
[src/app-framework-main.git]
/
src
/
wgt-json.c
diff --git
a/src/wgt-json.c
b/src/wgt-json.c
index
cc5ee93
..
258f151
100644
(file)
--- a/
src/wgt-json.c
+++ b/
src/wgt-json.c
@@
-314,11
+314,11
@@
static int add_provided(struct json_object *targets, const struct wgt_desc_featu
return add_targeted_params(targets, feat, actions);
}
return add_targeted_params(targets, feat, actions);
}
-static int add_required_
binding
(struct json_object *targets, const struct wgt_desc_feature *feat)
+static int add_required_
api
(struct json_object *targets, const struct wgt_desc_feature *feat)
{
static struct paramaction actions[] = {
{ .name = string_sharp_target, .action = NULL, .closure = NULL },
{
static struct paramaction actions[] = {
{ .name = string_sharp_target, .action = NULL, .closure = NULL },
- { .name = NULL, .action = add_param_array, .closure = (void*)string_required_
binding
}
+ { .name = NULL, .action = add_param_array, .closure = (void*)string_required_
api
}
};
return add_targeted_params(targets, feat, actions);
}
};
return add_targeted_params(targets, feat, actions);
}
@@
-370,7
+370,7
@@
static struct json_object *to_json(const struct wgt_desc *desc)
rc = -EINVAL;
}
featname += prefixlen;
rc = -EINVAL;
}
featname += prefixlen;
- if (!strcmp(featname, string_provided_
binding
)
+ if (!strcmp(featname, string_provided_
api
)
|| !strcmp(featname, string_provided_application)) {
rc2 = make_target(targets, feat);
if (rc2 < 0 && !rc)
|| !strcmp(featname, string_provided_application)) {
rc2 = make_target(targets, feat);
if (rc2 < 0 && !rc)
@@
-390,13
+390,13
@@
static struct json_object *to_json(const struct wgt_desc *desc)
rc = rc2;
}
else if (!strcmp(featname, string_provided_application)
rc = rc2;
}
else if (!strcmp(featname, string_provided_application)
- || !strcmp(featname, string_provided_
binding
)) {
+ || !strcmp(featname, string_provided_
api
)) {
rc2 = add_provided(targets, feat);
if (rc2 < 0 && !rc)
rc = rc2;
}
rc2 = add_provided(targets, feat);
if (rc2 < 0 && !rc)
rc = rc2;
}
- else if (!strcmp(featname, string_required_
binding
)) {
- rc2 = add_required_
binding
(targets, feat);
+ else if (!strcmp(featname, string_required_
api
)) {
+ rc2 = add_required_
api
(targets, feat);
if (rc2 < 0 && !rc)
rc = rc2;
}
if (rc2 < 0 && !rc)
rc = rc2;
}