diff --git a/src/kit/shell/inc/shell.h b/src/kit/shell/inc/shell.h index 51bd1c110224f01351dc4b85d3ae7b80b9dc2cf7..5400d9c5bafff20ecc0a42eacd7ac09ccdd2c08e 100644 --- a/src/kit/shell/inc/shell.h +++ b/src/kit/shell/inc/shell.h @@ -68,7 +68,7 @@ void get_history_path(char* history); void cleanup_handler(void* arg); void exitShell(); int shellDumpResult(TAOS* con, char* fname, int* error_no, bool printMode); -int shellPrintNChar(const char* str, int length, int width); +void shellPrintNChar(const char* str, int length, int width); void shellGetGrantInfo(void *con); int isCommentLine(char *line); diff --git a/src/kit/shell/src/shellDarwin.c b/src/kit/shell/src/shellDarwin.c index 2f5d1f421d3640f8a42c82cab0c9642b5a18acb9..e4ef06c4036ebd8f8c1638b63407889686c4c2d4 100644 --- a/src/kit/shell/src/shellDarwin.c +++ b/src/kit/shell/src/shellDarwin.c @@ -352,7 +352,7 @@ void *shellLoopQuery(void *arg) { return NULL; } -int shellPrintNChar(const char *str, int length, int width) { +void shellPrintNChar(const char *str, int length, int width) { int pos = 0, cols = 0; while (pos < length) { wchar_t wc; @@ -371,7 +371,9 @@ int shellPrintNChar(const char *str, int length, int width) { } } - return cols; + for (; cols < width; cols++) { + putchar(' '); + } } diff --git a/src/kit/shell/src/shellEngine.c b/src/kit/shell/src/shellEngine.c index b4103ab331cb918cb19a2e9cda84d91870091d0a..ba5909923b2e84a70fc987973249e7aab629c1bb 100644 --- a/src/kit/shell/src/shellEngine.c +++ b/src/kit/shell/src/shellEngine.c @@ -484,9 +484,7 @@ static void printField(const char* val, TAOS_FIELD* field, int width, int32_t le break; case TSDB_DATA_TYPE_BINARY: case TSDB_DATA_TYPE_NCHAR: - for (int w = shellPrintNChar(val, length, width); w < width; w++) { - putchar(' '); - } + shellPrintNChar(val, length, width); break; case TSDB_DATA_TYPE_TIMESTAMP: formatTimestamp(buf, *(int64_t*)val, precision); diff --git a/src/kit/shell/src/shellLinux.c b/src/kit/shell/src/shellLinux.c index 37c08d7ae98e6389d9ff446c32f44a1397103759..856e011a78bb63b112239f644d1423c0d21b8d04 100644 --- a/src/kit/shell/src/shellLinux.c +++ b/src/kit/shell/src/shellLinux.c @@ -329,7 +329,7 @@ void *shellLoopQuery(void *arg) { return NULL; } -int shellPrintNChar(const char *str, int length, int width) { +void shellPrintNChar(const char *str, int length, int width) { int pos = 0, cols = 0; while (pos < length) { wchar_t wc; @@ -348,7 +348,9 @@ int shellPrintNChar(const char *str, int length, int width) { } } - return cols; + for (; cols < width; cols++) { + putchar(' '); + } } int get_old_terminal_mode(struct termios *tio) { diff --git a/src/kit/shell/src/shellWindows.c b/src/kit/shell/src/shellWindows.c index 8c7f24ef5213c41eb327eaa3e35aab15e2c98712..c4466772766863bccd66869d434b38a1b9a47222 100644 --- a/src/kit/shell/src/shellWindows.c +++ b/src/kit/shell/src/shellWindows.c @@ -217,7 +217,7 @@ void *shellLoopQuery(void *arg) { return NULL; } -int shellPrintNChar(const char *str, int length, int width) { +void shellPrintNChar(const char *str, int length, int width) { int pos = 0, cols = 0; while (pos < length) { wchar_t wc; @@ -237,7 +237,9 @@ int shellPrintNChar(const char *str, int length, int width) { } } - return cols; + for (; cols < width; cols++) { + putchar(' '); + } }