提交 f710131b 编写于 作者: H handyohos

Bugfix: fix coding styles

Signed-off-by: Nhandyohos <zhangxiaotian@huawei.com>
Change-Id: I53085cfd8a2a170284a0e6997239636014175b88

#I7GBKO
上级 8f561f00
...@@ -379,7 +379,7 @@ int FsHvbConstructVerityTarget(DmVerityTarget *target, const char *devName, stru ...@@ -379,7 +379,7 @@ int FsHvbConstructVerityTarget(DmVerityTarget *target, const char *devName, stru
} }
if (snprintf_s(&devPath[0], sizeof(devPath), sizeof(devPath) - 1, "%s%s", if (snprintf_s(&devPath[0], sizeof(devPath), sizeof(devPath) - 1, "%s%s",
((strchr(devName "/") == NULL) ? FS_HVB_PARTITION_PREFIX : ""), devName) == -1) { ((strchr(devName, '/') == NULL) ? FS_HVB_PARTITION_PREFIX : ""), devName) == -1) {
BEGET_LOGE("error, snprintf_s devPath"); BEGET_LOGE("error, snprintf_s devPath");
return -1; return -1;
} }
......
...@@ -85,7 +85,7 @@ INIT_LOCAL_API int GetParameter_(const char *key, const char *def, char *value, ...@@ -85,7 +85,7 @@ INIT_LOCAL_API int GetParameter_(const char *key, const char *def, char *value,
return GetSystemError(ret); return GetSystemError(ret);
} }
static PropertyValueProcessor propertyGetProcessor = NULL; static PropertyValueProcessor g_propertyGetProcessor = NULL;
INIT_LOCAL_API const char *GetProperty(const char *key, const char **paramHolder) INIT_LOCAL_API const char *GetProperty(const char *key, const char **paramHolder)
{ {
...@@ -103,8 +103,8 @@ INIT_LOCAL_API const char *GetProperty(const char *key, const char **paramHolder ...@@ -103,8 +103,8 @@ INIT_LOCAL_API const char *GetProperty(const char *key, const char **paramHolder
free(res); free(res);
return NULL; return NULL;
} }
if (propertyGetProcessor != NULL) { if (g_propertyGetProcessor != NULL) {
res = propertyGetProcessor(key, res); res = g_propertyGetProcessor(key, res);
} }
*paramHolder = res; *paramHolder = res;
} }
...@@ -113,8 +113,8 @@ INIT_LOCAL_API const char *GetProperty(const char *key, const char **paramHolder ...@@ -113,8 +113,8 @@ INIT_LOCAL_API const char *GetProperty(const char *key, const char **paramHolder
INIT_LOCAL_API PropertyValueProcessor SetPropertyGetProcessor(PropertyValueProcessor processor) INIT_LOCAL_API PropertyValueProcessor SetPropertyGetProcessor(PropertyValueProcessor processor)
{ {
PropertyValueProcessor prev = propertyGetProcessor; PropertyValueProcessor prev = g_propertyGetProcessor;
propertyGetProcessor = processor; g_propertyGetProcessor = processor;
return prev; return prev;
} }
......
...@@ -30,7 +30,7 @@ extern "C" { ...@@ -30,7 +30,7 @@ extern "C" {
#define DEV_BUF_LENGTH 3 #define DEV_BUF_LENGTH 3
#define DEV_BUF_MAX_LENGTH 1024 #define DEV_BUF_MAX_LENGTH 1024
typedef char * (*PropertyValueProcessor)(const char *key, char *value); typedef char *(*PropertyValueProcessor)(const char *key, char *value);
INIT_LOCAL_API const char *GetProperty(const char *key, const char **paramHolder); INIT_LOCAL_API const char *GetProperty(const char *key, const char **paramHolder);
INIT_LOCAL_API PropertyValueProcessor SetPropertyGetProcessor(PropertyValueProcessor processor); INIT_LOCAL_API PropertyValueProcessor SetPropertyGetProcessor(PropertyValueProcessor processor);
......
...@@ -61,11 +61,11 @@ char *ReadFileToBuf(const char *configFile); ...@@ -61,11 +61,11 @@ char *ReadFileToBuf(const char *configFile);
int GetProcCmdlineValue(const char *name, const char *buffer, char *value, int length); int GetProcCmdlineValue(const char *name, const char *buffer, char *value, int length);
char *ReadFileData(const char *fileName); char *ReadFileData(const char *fileName);
typedef struct tagNAME_VALUE_PAIR{ typedef struct NameValuePair {
const char *name; const char *name;
const char *name_end; const char *nameEnd;
const char *value; const char *value;
const char *value_end; const char *valueEnd;
} NAME_VALUE_PAIR; } NAME_VALUE_PAIR;
int IterateNameValuePairs(const char *src, void (*iterator)(const NAME_VALUE_PAIR *nv, void *context), void *context); int IterateNameValuePairs(const char *src, void (*iterator)(const NAME_VALUE_PAIR *nv, void *context), void *context);
......
...@@ -36,15 +36,15 @@ ...@@ -36,15 +36,15 @@
#define OHOS_CMDLINE_PARA_PREFIX "ohos.boot." #define OHOS_CMDLINE_PARA_PREFIX "ohos.boot."
#define OHOS_CMDLINE_PARA_PREFIX_LEN 10 #define OHOS_CMDLINE_PARA_PREFIX_LEN 10
typedef struct cmdLineInfo { typedef struct CmdLineInfo {
const char *name; const char *name;
int (*processor)(const char *name, const char *value); int (*processor)(const char *name, const char *value);
} cmdLineInfo; } CmdLineInfo;
typedef struct cmdLineIteratorCtx { typedef struct CmdLineIteratorCtx {
char *cmdline; char *cmdline;
bool gotSn; bool gotSn;
} cmdLineIteratorCtx; } CmdLineIteratorCtx;
static int CommonDealFun(const char *name, const char *value) static int CommonDealFun(const char *name, const char *value)
{ {
...@@ -109,9 +109,9 @@ static void CmdlineIterator(const NAME_VALUE_PAIR *nv, void *context) ...@@ -109,9 +109,9 @@ static void CmdlineIterator(const NAME_VALUE_PAIR *nv, void *context)
const char *name; const char *name;
const char *matched; const char *matched;
char fullName[PARAM_NAME_LEN_MAX]; char fullName[PARAM_NAME_LEN_MAX];
cmdLineIteratorCtx *ctx = (cmdLineIteratorCtx *)context; CmdLineIteratorCtx *ctx = (CmdLineIteratorCtx *)context;
char *data = (char *)ctx->cmdline; char *data = (char *)ctx->cmdline;
static const cmdLineInfo CMDLINES[] = { static const CmdLineInfo CMDLINES[] = {
{ "hardware", CommonDealFun }, { "hardware", CommonDealFun },
{ "bootgroup", CommonDealFun }, { "bootgroup", CommonDealFun },
{ "reboot_reason", CommonDealFun }, { "reboot_reason", CommonDealFun },
...@@ -121,8 +121,8 @@ static void CmdlineIterator(const NAME_VALUE_PAIR *nv, void *context) ...@@ -121,8 +121,8 @@ static void CmdlineIterator(const NAME_VALUE_PAIR *nv, void *context)
{ "serialno", SnDealFun } { "serialno", SnDealFun }
}; };
data[nv->name_end - data] = '\0'; data[nv->nameEnd - data] = '\0';
data[nv->value_end - data] = '\0'; data[nv->valueEnd - data] = '\0';
PARAM_LOGV("proc cmdline: name [%s], value [%s]", nv->name, nv->value); PARAM_LOGV("proc cmdline: name [%s], value [%s]", nv->name, nv->value);
// Get name without prefix // Get name without prefix
...@@ -185,7 +185,7 @@ static void GenerateSnByDefault(void) ...@@ -185,7 +185,7 @@ static void GenerateSnByDefault(void)
INIT_LOCAL_API int LoadParamFromCmdLine(void) INIT_LOCAL_API int LoadParamFromCmdLine(void)
{ {
cmdLineIteratorCtx ctx; CmdLineIteratorCtx ctx;
ctx.gotSn = false; ctx.gotSn = false;
ctx.cmdline = ReadFileData(BOOT_CMD_LINE); ctx.cmdline = ReadFileData(BOOT_CMD_LINE);
......
...@@ -217,10 +217,10 @@ int IterateNameValuePairs(const char *src, void (*iterator)(const NAME_VALUE_PAI ...@@ -217,10 +217,10 @@ int IterateNameValuePairs(const char *src, void (*iterator)(const NAME_VALUE_PAI
seperator = strchr(src, ' '); seperator = strchr(src, ' ');
if (seperator == NULL) { if (seperator == NULL) {
// Last nv // Last nv
nv.value_end = src + strlen(src); nv.valueEnd = src + strlen(src);
src = NULL; src = NULL;
} else { } else {
nv.value_end = seperator; nv.valueEnd = seperator;
src = seperator + 1; src = seperator + 1;
} }
...@@ -230,11 +230,11 @@ int IterateNameValuePairs(const char *src, void (*iterator)(const NAME_VALUE_PAI ...@@ -230,11 +230,11 @@ int IterateNameValuePairs(const char *src, void (*iterator)(const NAME_VALUE_PAI
// Invalid name value pair // Invalid name value pair
continue; continue;
} }
if (seperator > nv.value_end) { if (seperator > nv.valueEnd) {
// name without value, just ignore // name without value, just ignore
continue; continue;
} }
nv.name_end = seperator; nv.nameEnd = seperator;
nv.value = seperator + 1; nv.value = seperator + 1;
iterator(&nv, context); iterator(&nv, context);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册