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

!68 将 syscap 字符串最大长度调整为 256。

Browse Source 
Merge pull request !68 from chenyude/rpcid_len
This commit is contained in:
openharmony_ci
2022-06-17 10:07:35 +00:00
committed by Gitee
parent a6d366b558 08855ec7f1
commit 11b5f2be10
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/syscap_define.h
+1 -1
View File
@@ -17,7 +17,7 @@
#define _SYSCAP_DEFINE_H
typedef struct SystemCapabilityWithNum {
char syscapStr[128];
char syscapStr[256];
uint16_t num;
} SyscapWithNum;
src/create_pcid.c
+10 -11
View File
@@ -30,8 +30,7 @@
#include "syscap_define.h"
#include "create_pcid.h"
#define SINGLE_FEAT_LENGTH (32 * 8)
#define PER_SYSCAP_LEN_MAX 128
#define SINGLE_SYSCAP_LEN 256
#define PCID_OUT_BUFFER 32
#define PRIVATE_SYSCAP_SIZE 1000
#define UINT8_BIT 8
@@ -423,9 +422,9 @@ int32_t DecodePCID(char *inputFile, char *outDirPath)
char *ptrPrivateSyscap = (char *)(pcidMain + 1);
uint16_t privateSyscapLen = contextBufLen - sizeof(PCIDMain) - 1;
char priSyscapStr[PER_SYSCAP_LEN_MAX] = {0};
char priSyscapStr[SINGLE_SYSCAP_LEN] = {0};
char *tempPriSyscapStr = priSyscapStr;
char fullPriSyscapStr[PER_SYSCAP_LEN_MAX] = {0};
char fullPriSyscapStr[SINGLE_SYSCAP_LEN] = {0};
if (privateSyscapLen < 0) {
PRINT_ERR("parse private syscap failed.");
ret = -1;
@@ -437,7 +436,7 @@ int32_t DecodePCID(char *inputFile, char *outDirPath)
while (*ptrPrivateSyscap != '\0') {
if (*ptrPrivateSyscap == ',') {
*tempPriSyscapStr = '\0';
ret = sprintf_s(fullPriSyscapStr, PER_SYSCAP_LEN_MAX, "SystemCapability.%s", priSyscapStr);
ret = sprintf_s(fullPriSyscapStr, SINGLE_SYSCAP_LEN, "SystemCapability.%s", priSyscapStr);
if (ret == -1) {
printf("sprintf_s failed\n");
goto FREE_VECTOR_OUT;
@@ -761,19 +760,19 @@ int32_t DecodePcidToString(char *inputFile, char *outDirPath)
if (priSyscapCount == 0) {
goto OUT_PUT;
}
priSyscapFull = (char *)malloc(priSyscapCount * SINGLE_FEAT_LENGTH);
priSyscapFull = (char *)malloc(priSyscapCount * SINGLE_SYSCAP_LEN);
if (priSyscapFull == NULL) {
PRINT_ERR("malloc failed\n");
goto FREE_PRISYSCAP_FULL;
}
(void)memset_s(priSyscapFull, priSyscapCount * SINGLE_FEAT_LENGTH,
0, priSyscapCount * SINGLE_FEAT_LENGTH);
char tempSyscap[SINGLE_FEAT_LENGTH] = {0};
(void)memset_s(priSyscapFull, priSyscapCount * SINGLE_SYSCAP_LEN,
0, priSyscapCount * SINGLE_SYSCAP_LEN);
char tempSyscap[SINGLE_SYSCAP_LEN] = {0};
char *temp = tempSyscap;
for (i = 0, j = 0; i < privateSyscapLen; i++) {
if (*privateSyscap == ',') {
*temp = '\0';
ret = sprintf_s(priSyscapFull + j * SINGLE_FEAT_LENGTH, SINGLE_FEAT_LENGTH,
ret = sprintf_s(priSyscapFull + j * SINGLE_SYSCAP_LEN, SINGLE_SYSCAP_LEN,
"SystemCapability.%s", tempSyscap);
if (ret == -1) {
PRINT_ERR("sprintf_s failed\n");
@@ -809,7 +808,7 @@ OUT_PUT:
}
}
for (i = 0; i < priSyscapCount; i++) {
ret = sprintf_s(output, outputLen, "%s,%s", output, priSyscapFull + i * SINGLE_FEAT_LENGTH);
ret = sprintf_s(output, outputLen, "%s,%s", output, priSyscapFull + i * SINGLE_SYSCAP_LEN);
if (ret == -1) {
PRINT_ERR("sprintf_s failed\n");
goto FREE_OUTPUT;
src/syscap_tool.c
+1 -1
View File
@@ -44,7 +44,7 @@ typedef struct RequiredProductCompatibilityIDHead {
uint16_t apiVersionType : 1;
} RPCIDHead;
#define SINGLE_SYSCAP_LEN 128
#define SINGLE_SYSCAP_LEN 256
#define SYSCAP_PREFIX_LEN 17
#define SINGLE_FEAT_LEN (SINGLE_SYSCAP_LEN - SYSCAP_PREFIX_LEN)
#define UINT8_BIT 8