提交 b25c36c3 编写于 作者: H Hui Li

[modify for covrity scan]

上级 99cb63d1
...@@ -86,7 +86,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) { ...@@ -86,7 +86,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
wordfree(&full_path); wordfree(&full_path);
return -1; return -1;
} }
strcpy(configDir, full_path.we_wordv[0]); tstrncpy(configDir, full_path.we_wordv[0], TSDB_FILENAME_LEN);
wordfree(&full_path); wordfree(&full_path);
break; break;
case 's': case 's':
...@@ -100,7 +100,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) { ...@@ -100,7 +100,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
fprintf(stderr, "Invalid path %s\n", arg); fprintf(stderr, "Invalid path %s\n", arg);
return -1; return -1;
} }
strcpy(arguments->file, full_path.we_wordv[0]); tstrncpy(arguments->file, full_path.we_wordv[0], TSDB_FILENAME_LEN);
wordfree(&full_path); wordfree(&full_path);
break; break;
case 'D': case 'D':
...@@ -108,7 +108,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) { ...@@ -108,7 +108,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
fprintf(stderr, "Invalid path %s\n", arg); fprintf(stderr, "Invalid path %s\n", arg);
return -1; return -1;
} }
strcpy(arguments->dir, full_path.we_wordv[0]); tstrncpy(arguments->dir, full_path.we_wordv[0], TSDB_FILENAME_LEN);
wordfree(&full_path); wordfree(&full_path);
break; break;
case 'T': case 'T':
......
...@@ -655,7 +655,7 @@ int taosDumpDb(SDbInfo *dbInfo, SDumpArguments *arguments, FILE *fp) { ...@@ -655,7 +655,7 @@ int taosDumpDb(SDbInfo *dbInfo, SDumpArguments *arguments, FILE *fp) {
} }
close(fd); close(fd);
remove(".table.tmp"); (void)remove(".table.tmp");
return 0; return 0;
} }
......
...@@ -553,7 +553,7 @@ void taosSetCoreDump() { ...@@ -553,7 +553,7 @@ void taosSetCoreDump() {
struct rlimit rlim; struct rlimit rlim;
struct rlimit rlim_new; struct rlimit rlim_new;
if (getrlimit(RLIMIT_CORE, &rlim) == 0) { if (getrlimit(RLIMIT_CORE, &rlim) == 0) {
uPrint("the old unlimited para: rlim_cur=%" PRIu64, ", rlim_max=%" PRIu64, rlim.rlim_cur, rlim.rlim_max); uPrint("the old unlimited para: rlim_cur=%" PRIu64 ", rlim_max=%" PRIu64, rlim.rlim_cur, rlim.rlim_max);
rlim_new.rlim_cur = RLIM_INFINITY; rlim_new.rlim_cur = RLIM_INFINITY;
rlim_new.rlim_max = RLIM_INFINITY; rlim_new.rlim_max = RLIM_INFINITY;
if (setrlimit(RLIMIT_CORE, &rlim_new) != 0) { if (setrlimit(RLIMIT_CORE, &rlim_new) != 0) {
...@@ -565,7 +565,7 @@ void taosSetCoreDump() { ...@@ -565,7 +565,7 @@ void taosSetCoreDump() {
} }
if (getrlimit(RLIMIT_CORE, &rlim) == 0) { if (getrlimit(RLIMIT_CORE, &rlim) == 0) {
uPrint("the new unlimited para: rlim_cur=%" PRIu64, ", rlim_max=%" PRIu64, rlim.rlim_cur, rlim.rlim_max); uPrint("the new unlimited para: rlim_cur=%" PRIu64 ", rlim_max=%" PRIu64, rlim.rlim_cur, rlim.rlim_max);
} }
#ifndef _TD_ARM_ #ifndef _TD_ARM_
......
...@@ -135,7 +135,7 @@ char* strtolower(char *dst, const char *src); ...@@ -135,7 +135,7 @@ char* strtolower(char *dst, const char *src);
int64_t strnatoi(char *num, int32_t len); int64_t strnatoi(char *num, int32_t len);
char* strreplace(const char* str, const char* pattern, const char* rep); //char* strreplace(const char* str, const char* pattern, const char* rep);
char *strbetween(char *string, char *begin, char *end); char *strbetween(char *string, char *begin, char *end);
......
...@@ -208,14 +208,15 @@ int taosOpenNoteWithMaxLines(char *fn, int maxLines, int maxNoteNum, taosNoteInf ...@@ -208,14 +208,15 @@ int taosOpenNoteWithMaxLines(char *fn, int maxLines, int maxNoteNum, taosNoteInf
} }
} }
sprintf(name, "%s.%d", pNote->taosNoteName, pNote->taosNoteFlag); char noteName[NOTE_FILE_NAME_LEN * 2] = "\0";
sprintf(noteName, "%s.%d", pNote->taosNoteName, pNote->taosNoteFlag);
pthread_mutex_init(&pNote->taosNoteMutex, NULL); pthread_mutex_init(&pNote->taosNoteMutex, NULL);
umask(0); umask(0);
pNote->taosNoteFd = open(name, O_WRONLY | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO); pNote->taosNoteFd = open(noteName, O_WRONLY | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
if (pNote->taosNoteFd < 0) { if (pNote->taosNoteFd < 0) {
fprintf(stderr, "failed to open note file:%s reason:%s\n", name, strerror(errno)); fprintf(stderr, "failed to open note file:%s reason:%s\n", noteName, strerror(errno));
return -1; return -1;
} }
taosLockNote(pNote->taosNoteFd, pNote); taosLockNote(pNote->taosNoteFd, pNote);
...@@ -223,7 +224,7 @@ int taosOpenNoteWithMaxLines(char *fn, int maxLines, int maxNoteNum, taosNoteInf ...@@ -223,7 +224,7 @@ int taosOpenNoteWithMaxLines(char *fn, int maxLines, int maxNoteNum, taosNoteInf
// only an estimate for number of lines // only an estimate for number of lines
struct stat filestat; struct stat filestat;
if (fstat(pNote->taosNoteFd, &filestat) < 0) { if (fstat(pNote->taosNoteFd, &filestat) < 0) {
fprintf(stderr, "failed to fstat note file:%s reason:%s\n", name, strerror(errno)); fprintf(stderr, "failed to fstat note file:%s reason:%s\n", noteName, strerror(errno));
return -1; return -1;
} }
size = (int)filestat.st_size; size = (int)filestat.st_size;
......
...@@ -314,6 +314,7 @@ int64_t strnatoi(char *num, int32_t len) { ...@@ -314,6 +314,7 @@ int64_t strnatoi(char *num, int32_t len) {
return ret; return ret;
} }
#if 0
FORCE_INLINE size_t getLen(size_t old, size_t size) { FORCE_INLINE size_t getLen(size_t old, size_t size) {
if (old == 1) { if (old == 1) {
old = 2; old = 2;
...@@ -401,6 +402,7 @@ char *strreplace(const char *str, const char *pattern, const char *rep) { ...@@ -401,6 +402,7 @@ char *strreplace(const char *str, const char *pattern, const char *rep) {
return dest; return dest;
} }
#endif
char *strbetween(char *string, char *begin, char *end) { char *strbetween(char *string, char *begin, char *end) {
char *result = NULL; char *result = NULL;
......
...@@ -26,6 +26,7 @@ TEST(testCase, string_dequote_test) { ...@@ -26,6 +26,7 @@ TEST(testCase, string_dequote_test) {
EXPECT_EQ(3, lx); EXPECT_EQ(3, lx);
} }
#if 0
TEST(testCase, string_replace_test) { TEST(testCase, string_replace_test) {
char t3[] = "abc01abc02abc"; char t3[] = "abc01abc02abc";
char* ret = strreplace(t3, "abc", "7"); char* ret = strreplace(t3, "abc", "7");
...@@ -87,6 +88,7 @@ TEST(testCase, string_replace_test) { ...@@ -87,6 +88,7 @@ TEST(testCase, string_replace_test) {
EXPECT_STREQ("abcdef", ret); EXPECT_STREQ("abcdef", ret);
free(ret); free(ret);
} }
#endif
TEST(testCase, string_tolower_test) { TEST(testCase, string_tolower_test) {
char t[1024] = {1}; char t[1024] = {1};
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册