diff options
| author |   José Bollo <jose.bollo@iot.bzh> | 2017-01-09 13:41:16 +0100 |
|---|---|---|
| committer | José Bollo <jose.bollo@iot.bzh> | 2017-01-09 13:44:35 +0100 |
| commit | c643fe4639e923b0a88e1a5d9df691418b540056 (patch) | |
| tree | 58e5d937fef422808e15e56035f4f060a9a07c0c /src/wgtpkg-install.c | |
| parent | 86be207174efcb84f6eb22946724a25a3cd9b56c (diff) | |
Put strings in one place
Change-Id: I79afd4fa18996e7879db4c11480a5400637dad2d
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'src/wgtpkg-install.c')
| -rw-r--r-- | src/wgtpkg-install.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/wgtpkg-install.c b/src/wgtpkg-install.c index 3dbd6ac..550135c 100644 --- a/src/wgtpkg-install.c +++ b/src/wgtpkg-install.c @@ -30,6 +30,7 @@ #include "verbose.h" #include "wgt.h" #include "wgt-info.h" +#include "wgt-strings.h" #include "wgtpkg-files.h" #include "wgtpkg-workdir.h" #include "wgtpkg-zip.h" @@ -39,9 +40,6 @@ #include "secmgr-wrap.h" #include "utils-dir.h" -static const char permission_required[] = "required"; -static const char permission_optional[] = "optional"; -static const char feature_required_permissions[] = FWK_PREFIX "required-permission"; static const char* exec_type_strings[] = { "application/x-executable", "application/vnd.agl.native" @@ -104,9 +102,9 @@ static int set_required_permissions(struct wgt_desc_param *params, int required) while (params) { /* check the value */ - if (!strcmp(params->value, permission_required)) + if (!strcmp(params->value, string_required)) optional = !required; - else if (!strcmp(params->value, permission_optional)) + else if (!strcmp(params->value, string_optional)) optional = 1; else { ERROR("unexpected parameter value: %s found for %s", params->value, params->name); @@ -136,7 +134,7 @@ static int check_widget(const struct wgt_desc *desc) result = check_temporary_constraints(desc); feature = desc->features; while(result >= 0 && feature) { - if (!strcmp(feature->name, feature_required_permissions)) + if (!strcmp(feature->name, feature_required_permission)) result = set_required_permissions(feature->params, feature->required); feature = feature->next; } |