Merge pull request #895 from taosdata/hzcheng

resolve warnings in kit

src/kit/shell/src/shellCommand.c

@@ -19,6 +19,8 @@
 #include "shell.h"
 #include "shellCommand.h"
 
+extern int wcwidth(wchar_t c);
+extern int wcswidth(const wchar_t *s, size_t n);
 typedef struct {
   char widthInString;
   char widthOnScreen;

src/kit/shell/src/shellEngine.c

@@ -16,6 +16,7 @@
 #define _XOPEN_SOURCE
 #define _DEFAULT_SOURCE
 
+#include <inttypes.h>
 #include "os.h"
 #include "shell.h"
 #include "shellCommand.h"
@@ -446,7 +447,7 @@ int shellDumpResult(TAOS *con, char *fname, int *error_no, bool printMode) {
                 printf("%*d|", l[i], *((int *)row[i]));
                 break;
               case TSDB_DATA_TYPE_BIGINT:
-                printf("%*lld|", l[i], *((int64_t *)row[i]));
+                printf("%*" PRId64 "|", l[i], *((int64_t *)row[i]));
                 break;
               case TSDB_DATA_TYPE_FLOAT: {
 #ifdef _TD_ARM_32_
@@ -481,7 +482,7 @@ int shellDumpResult(TAOS *con, char *fname, int *error_no, bool printMode) {
                 break;
               case TSDB_DATA_TYPE_TIMESTAMP:
                 if (args.is_raw_time) {
-                  printf(" %lld|", *(int64_t *)row[i]);
+                  printf(" %" PRId64 "|", *(int64_t *)row[i]);
                 } else {
                   if (taos_result_precision(result) == TSDB_TIME_PRECISION_MICRO) {
                     tt = (time_t)((*(int64_t *)row[i]) / 1000000);
@@ -531,7 +532,7 @@ int shellDumpResult(TAOS *con, char *fname, int *error_no, bool printMode) {
                 printf("%d\n", *((int *)row[i]));
                 break;
               case TSDB_DATA_TYPE_BIGINT:
-                printf("%lld\n", *((int64_t *)row[i]));
+                printf("%" PRId64 "\n", *((int64_t *)row[i]));
                 break;
               case TSDB_DATA_TYPE_FLOAT: {
 #ifdef _TD_ARM_32_
@@ -564,7 +565,7 @@ int shellDumpResult(TAOS *con, char *fname, int *error_no, bool printMode) {
                 break;
               case TSDB_DATA_TYPE_TIMESTAMP:
                 if (args.is_raw_time) {
-                  printf("%lld\n", *(int64_t *)row[i]);
+                  printf("%" PRId64 "\n", *(int64_t *)row[i]);
                 } else {
                   if (taos_result_precision(result) == TSDB_TIME_PRECISION_MICRO) {
                     tt = (time_t)((*(int64_t *)row[i]) / 1000000);
@@ -619,7 +620,7 @@ int shellDumpResult(TAOS *con, char *fname, int *error_no, bool printMode) {
                 fprintf(fp, "%d", *((int *)row[i]));
                 break;
               case TSDB_DATA_TYPE_BIGINT:
-                fprintf(fp, "%lld", *((int64_t *)row[i]));
+                fprintf(fp, "%" PRId64, *((int64_t *)row[i]));
                 break;
               case TSDB_DATA_TYPE_FLOAT: {
 #ifdef _TD_ARM_32_
@@ -651,7 +652,7 @@ int shellDumpResult(TAOS *con, char *fname, int *error_no, bool printMode) {
                 break;
               case TSDB_DATA_TYPE_TIMESTAMP:
                 if (args.is_raw_time) {
-                  fprintf(fp, "%lld", *(int64_t *)row[i]);
+                  fprintf(fp, "%" PRId64, *(int64_t *)row[i]);
                 } else {
                   if (taos_result_precision(result) == TSDB_TIME_PRECISION_MICRO) {
                     tt = (time_t)((*(int64_t *)row[i]) / 1000000);

src/kit/shell/src/shellLinux.c

@@ -26,6 +26,7 @@
 int indicator = 1;
 struct termios oldtio;
 
+extern int wcwidth(wchar_t c);
 void insertChar(Command *cmd, char *c, int size);
 const char *argp_program_version = version;
 const char *argp_program_bug_address = "<support@taosdata.com>";

src/kit/taosdemo/taosdemo.c

@@ -265,30 +265,35 @@ double getCurrentTime();
 void callBack(void *param, TAOS_RES *res, int code);
 
 int main(int argc, char *argv[]) {
-  struct arguments arguments = {NULL,
-                                0,
-                                "root",
-                                "taosdata",
-                                "test",
-                                "t",
-                                false,
-                                false,
-                                "./output.txt",
-                                0,
-                                "int",
+  struct arguments arguments = {NULL,            // host
+                                0,               // port
+                                "root",          // user
+                                "taosdata",      // password
+                                "test",          // database
+                                "t",             // tb_prefix
+                                false,           // use_metric
+                                false,           // insert_only
+                                "./output.txt",  // output_file
+                                0,               // mode
+                                {
+                                "int",           // datatype
                                 "",
                                 "",
                                 "",
                                 "",
                                 "",
                                 "",
-                                "",
-                                8,
-                                1,
-                                1,
-                                1,
-                                1,
-                                50000};
+                                ""
+                                },
+                                8,               // len_of_binary
+                                1,               // num_of_CPR
+                                1,               // num_of_connections
+                                1,               // num_of_RPR
+                                1,               // num_of_tables
+                                50000,           // num_of_DPT
+                                0,               // abort
+                                NULL             // arg_list
+                                };
 
   /* Parse our arguments; every option seen by parse_opt will be
      reflected in arguments. */

src/os/linux/inc/os.h

@@ -23,6 +23,7 @@ extern "C" {
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <error.h>
 #include <argp.h>
 #include <arpa/inet.h>
 #include <assert.h>