openharmony/developtools_syscap_codec
1
0
Fork 0
mirror of https://github.com/openharmony/developtools_syscap_codec.git synced 2026-08-27 02:11:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Modify some details of DecodePrivateSyscap.

Browse Source 
Signed-off-by: yudechen <chenyude@huawei.com>
Change-Id: I9b327402a342b8844c9449c3e5c42e56b17b4f22
This commit is contained in:
yudechen
2022-05-07 14:11:39 +08:00
parent 615a6137cd
commit 0bcba1c14c
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
interfaces/inner_api/syscap_interface.c
+20 -18
View File
@@ -192,48 +192,50 @@ bool DecodeOsSyscap(char input[128], char (**output)[128], int *outputCnt)
bool DecodePrivateSyscap(char *input, char (**output)[128], int *outputCnt)
{
char (*outputArray)[MAX_SYSCAP_STR_LEN] = NULL;
char *inputStr = input;
char *inputPos = input;
uint16_t bufferLen;
int syscapCnt = 0, ret;
int ret;
int syscapCnt = 0;
while (*inputStr != '\0') {
if (*inputStr == ',') {
while (*inputPos != '\0') {
if (*inputPos == ',') {
syscapCnt++;
}
inputStr++;
inputPos++;
}
inputStr = input;
inputPos = input;
bufferLen = MAX_SYSCAP_STR_LEN * syscapCnt;
outputArray = (char (*)[MAX_SYSCAP_STR_LEN])malloc(bufferLen);
if (outputArray == NULL) {
PRINT_ERR("malloc buffer failed, size = %d, errno = %d\n", bufferLen, errno);
syscapCnt = 0;
*outputCnt = 0;
return false;
}
(void)memset_s(outputArray, bufferLen, 0, bufferLen);
char **outputArrayBak = (char **)outputArray;
char priSyscapStr[MAX_SYSCAP_STR_LEN - 17] = {0}; // 17. size of "SystemCapability."
char *tempPriSyscapStr = priSyscapStr;
while (*inputStr != '\0') {
if (*inputStr == ',') {
*tempPriSyscapStr = '\0';
ret = sprintf_s(*outputArray, MAX_SYSCAP_STR_LEN, "SystemCapability.%s", priSyscapStr);
*output = outputArray;
char buffer[MAX_SYSCAP_STR_LEN - 17] = {0}; // 17. size of "SystemCapability."
char *bufferPos = buffer;
while (*inputPos != '\0') {
if (*inputPos == ',') {
*bufferPos = '\0';
ret = sprintf_s(*outputArray, MAX_SYSCAP_STR_LEN, "SystemCapability.%s", buffer);
if (ret == -1) {
PRINT_ERR("sprintf_s failed\n");
*outputCnt = 0;
free(outputArray);
outputArray = NULL;
return false;
}
tempPriSyscapStr = priSyscapStr;
bufferPos = buffer;
outputArray++;
inputStr++;
inputPos++;
continue;
}
*tempPriSyscapStr++ = *inputStr++;
*bufferPos++ = *inputPos++;
}
*outputCnt = syscapCnt;
*output = (char (*)[MAX_SYSCAP_STR_LEN])outputArrayBak;
return true;
}