xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

chore: more check

This commit is contained in:
kailixu 2023-07-16 07:13:53 +08:00
parent 3fd349d165
commit 918d3cca0c
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/dnode/mgmt/node_mgmt/src/dmEnv.c
View File

@ -20,18 +20,18 @@
#define STR_STR_CMP(s, d) (strstr((s), (d))) #define STR_STR_CMP(s, d) (strstr((s), (d)))
#define STR_INT_CMP(s, d, c) (taosStr2Int32(s, 0, 10) c(d)) #define STR_INT_CMP(s, d, c) (taosStr2Int32(s, 0, 10) c(d))
#define STR_STR_SIGN ("ia") #define STR_STR_SIGN ("ia")
#define DM_INIT_MON() \ #define DM_INIT_MON() \
do { \ do { \
code = (int32_t)((2147483648 | ((0) << 7 | (298)))); \ code = (int32_t)(2147483648 | 298); \
strncpy(stName, tsVersionName, 64); \ strncpy(stName, tsVersionName, 64); \
monCfg.maxLogs = tsMonitorMaxLogs; \ monCfg.maxLogs = tsMonitorMaxLogs; \
monCfg.port = tsMonitorPort; \ monCfg.port = tsMonitorPort; \
monCfg.server = tsMonitorFqdn; \ monCfg.server = tsMonitorFqdn; \
monCfg.comp = tsMonitorComp; \ monCfg.comp = tsMonitorComp; \
if (monInit(&monCfg) != 0) { \ if (monInit(&monCfg) != 0) { \
if (terrno != 0) code = terrno; \ if (terrno != 0) code = terrno; \
goto _exit; \ goto _exit; \
} \ } \
} while (0) } while (0)
#define DM_ERR_RTN(c) \ #define DM_ERR_RTN(c) \
@ -76,7 +76,7 @@ static int32_t dmInitMonitor() {
DM_ERR_RTN(0); DM_ERR_RTN(0);
} }
if (taosGetOsReleaseName(reName, stName, ver, 64) != 0) { if (taosGetOsReleaseName(reName, stName, ver, 64) != 0) {
goto _exit; DM_ERR_RTN(code);
} }
if (STR_CASE_CMP(stName, dmOS[0])) { if (STR_CASE_CMP(stName, dmOS[0])) {
if (STR_INT_CMP(ver, 17, >)) { if (STR_INT_CMP(ver, 17, >)) {

6
source/os/src/osSysinfo.c
View File

@ -373,6 +373,7 @@ int32_t taosGetOsReleaseName(char *releaseName, char* sName, char* ver, int32_t
dest = sName; dest = sName;
} else if (strncmp(line, "PRETTY_NAME", 11) == 0) { } else if (strncmp(line, "PRETTY_NAME", 11) == 0) {
dest = releaseName; dest = releaseName;
code = 0;
} else if (strncmp(line, "VERSION_ID", 10) == 0) { } else if (strncmp(line, "VERSION_ID", 10) == 0) {
dest = ver; dest = ver;
} else { } else {
@ -386,10 +387,7 @@ int32_t taosGetOsReleaseName(char *releaseName, char* sName, char* ver, int32_t
} }
tstrncpy(dest, p, maxLen); tstrncpy(dest, p, maxLen);
if (++cnt >= 3) { if (++cnt >= 3) break;
code = 0;
break;
}
} }
taosCloseFile(&pFile); taosCloseFile(&pFile);