fix: merge errors
This commit is contained in:
parent
e21a901da4
commit
bea73b122d
|
@ -525,8 +525,8 @@ bool tIsValidFileName(const char *fileName, const char *pattern) {
|
||||||
|
|
||||||
bool tIsValidFilePath(const char *filePath, const char *pattern) {
|
bool tIsValidFilePath(const char *filePath, const char *pattern) {
|
||||||
const char *filePathPattern = "^[a-zA-Z0-9:/\\_.-]+$";
|
const char *filePathPattern = "^[a-zA-Z0-9:/\\_.-]+$";
|
||||||
|
|
||||||
return tIsValidFileName(filePath, pattern ? pattern : filePathPattern);
|
return tIsValidFileName(filePath, pattern ? pattern : filePathPattern);
|
||||||
|
}
|
||||||
|
|
||||||
bool taosIsBigChar(char c) {
|
bool taosIsBigChar(char c) {
|
||||||
if (c >= 'A' && c <= 'Z') {
|
if (c >= 'A' && c <= 'Z') {
|
||||||
|
|
Loading…
Reference in New Issue