diff --git a/frameworks/config_policy/src/config_policy_utils.c b/frameworks/config_policy/src/config_policy_utils.c index 4e80e3ad4ba06f33e791a98c8ef052961a326380..70084186b9e2ba29c5142a79854b42c5327e4a24 100644 --- a/frameworks/config_policy/src/config_policy_utils.c +++ b/frameworks/config_policy/src/config_policy_utils.c @@ -49,7 +49,7 @@ static void GetCfgDirRealPolicyValue(CfgDir *res) if (res == NULL) { return; } - res->realPolicyValue = strdup("/system/etc:/chipset/etc:/sys-prod/etc:/chip-prod/etc"); + res->realPolicyValue = strdup("/system:/chipset:/sys_prod:/chip_prod"); } char *GetOneCfgFile(const char *pathSuffix, char *buf, unsigned int bufLength) diff --git a/interfaces/innerkits/include/config_policy_utils.h b/interfaces/innerkits/include/config_policy_utils.h index 9fea8136777a8a9c313d1944eeda9498d2be8333..9b39afc7b5469fad49fecf8994d8801f4e800047 100644 --- a/interfaces/innerkits/include/config_policy_utils.h +++ b/interfaces/innerkits/include/config_policy_utils.h @@ -46,13 +46,13 @@ void FreeCfgFiles(CfgFiles *res); void FreeCfgDirList(CfgDir *res); // get the highest priority config file -// pathSuffixStr: the relative path of the config file, e.g. "xml/config.xml" +// pathSuffixStr: the relative path of the config file, e.g. "etc/xml/config.xml" // buf: recommended buffer length is MAX_PATH_LEN // return: path of the highest priority config file, return '\0' when such a file is not found char *GetOneCfgFile(const char *pathSuffix, char *buf, unsigned int bufLength); // get config files, ordered by priority from low to high -// pathSuffixStr: the relative path of the config file, e.g. "xml/config.xml" +// pathSuffixStr: the relative path of the config file, e.g. "etc/xml/config.xml" // return: paths of config files // CAUTION: please use FreeCfgFiles() to avoid memory leak. CfgFiles *GetCfgFiles(const char *pathSuffix); diff --git a/test/resource/ohos_test.xml b/test/resource/ohos_test.xml index 4fff2f72b4734b2c87b160014a2cb440ecba9b29..bef5f403b58e01c96898d6ccea92eae27cc0bcd5 100644 --- a/test/resource/ohos_test.xml +++ b/test/resource/ohos_test.xml @@ -16,18 +16,18 @@ -