From 6d17dbc0f89048a4316a2b38175a818d808625be Mon Sep 17 00:00:00 2001 From: slguan Date: Sat, 13 Jul 2019 14:04:30 +0800 Subject: [PATCH] Clean up some warnings --- src/client/src/tscParseInsert.c | 1 + src/client/src/tscSQLParser.c | 3 ++- src/kit/shell/shellEngine.c | 2 +- src/kit/taosBenchmark/taosBenchmark.c | 5 +++-- src/rpc/src/trpc.c | 2 ++ src/system/inc/vnode.h | 2 ++ src/system/src/mgmtDnode.c | 1 + src/system/src/mgmtDnodeInt.c | 1 + src/system/src/mgmtMeter.c | 1 - src/system/src/mgmtShell.c | 2 ++ src/system/src/mgmtVgroup.c | 1 + src/system/src/vnodeImport.c | 3 ++- src/system/src/vnodeMeter.c | 2 ++ src/system/src/vnodeRead.c | 1 + src/system/src/vnodeShell.c | 2 +- src/system/src/vnodeStore.c | 2 ++ src/system/src/vnodeUtil.c | 2 ++ src/util/src/tcrc32c.c | 1 + src/util/src/ttime.c | 2 +- 19 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/client/src/tscParseInsert.c b/src/client/src/tscParseInsert.c index 6de2d3bb87..d22a1de6fd 100644 --- a/src/client/src/tscParseInsert.c +++ b/src/client/src/tscParseInsert.c @@ -19,6 +19,7 @@ #define _XOPEN_SOURCE #pragma GCC diagnostic ignored "-Woverflow" +#pragma GCC diagnostic ignored "-Wunused-variable" #include #include diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index e153344cb4..f87ede9ced 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -14,7 +14,7 @@ */ #define _XOPEN_SOURCE -#define _BSD_SOURCE +#define _DEFAULT_SOURCE #include #include @@ -35,6 +35,7 @@ #include "tschemautil.h" #include "tsclient.h" #include "tsql.h" +#pragma GCC diagnostic ignored "-Wunused-variable" typedef struct SColumnIdList { SSchema* pSchema; diff --git a/src/kit/shell/shellEngine.c b/src/kit/shell/shellEngine.c index dc7ae09945..3ea6babf9f 100644 --- a/src/kit/shell/shellEngine.c +++ b/src/kit/shell/shellEngine.c @@ -14,7 +14,7 @@ */ #define _XOPEN_SOURCE -#define _BSD_SOURCE +#define _DEFAULT_SOURCE #include #include diff --git a/src/kit/taosBenchmark/taosBenchmark.c b/src/kit/taosBenchmark/taosBenchmark.c index 296eac79b1..699dc895bd 100644 --- a/src/kit/taosBenchmark/taosBenchmark.c +++ b/src/kit/taosBenchmark/taosBenchmark.c @@ -13,7 +13,7 @@ * along with this program. If not, see . */ -/* #define _GNU_SOURCE */ +#define _GNU_SOURCE #include #include @@ -30,6 +30,7 @@ #include #include "taos.h" +#pragma GCC diagnostic ignored "-Wmissing-braces" #define BUFFER_SIZE 65536 #define MAX_DB_NAME_SIZE 64 @@ -567,7 +568,7 @@ void *readTable(void *sarg) { } fprintf(fp, "|%10s | %10d | %12.2f | %10.2f |\n", - aggreFunc[j] == "*" ? " * " : aggreFunc[j], totalData, + aggreFunc[j][0] == '*' ? " * " : aggreFunc[j], totalData, (double)(num_of_tables * num_of_DPT) / totalT, totalT * 1000); printf("select %10s took %.6f second(s)\n", aggreFunc[j], totalT); } diff --git a/src/rpc/src/trpc.c b/src/rpc/src/trpc.c index 31b6f8f94d..b9a8179393 100644 --- a/src/rpc/src/trpc.c +++ b/src/rpc/src/trpc.c @@ -50,6 +50,8 @@ #include "tudp.h" #include "tutil.h" +#pragma GCC diagnostic ignored "-Wpointer-to-int-cast" + typedef struct _msg_node { struct _msg_node *next; void * ahandle; diff --git a/src/system/inc/vnode.h b/src/system/inc/vnode.h index b9683d8075..9cbc7e664b 100644 --- a/src/system/inc/vnode.h +++ b/src/system/inc/vnode.h @@ -503,6 +503,8 @@ void vnodeRemoveVnode(int vnode); int vnodeCreateVnode(int vnode, SVnodeCfg *pCfg, SVPeerDesc *pDesc); +void vnodeOpenStreams(void *param, void *tmrId); + void vnodeCreateStream(SMeterObj *pObj); void vnodeRemoveStream(SMeterObj *pObj); diff --git a/src/system/src/mgmtDnode.c b/src/system/src/mgmtDnode.c index a5ef95765c..a852c888a9 100644 --- a/src/system/src/mgmtDnode.c +++ b/src/system/src/mgmtDnode.c @@ -23,6 +23,7 @@ #include "mgmt.h" #include "tschemautil.h" #include "tstatus.h" +#pragma GCC diagnostic ignored "-Wunused-variable" SDnodeObj dnodeObj; diff --git a/src/system/src/mgmtDnodeInt.c b/src/system/src/mgmtDnodeInt.c index af73bc4be8..304d491402 100644 --- a/src/system/src/mgmtDnodeInt.c +++ b/src/system/src/mgmtDnodeInt.c @@ -21,6 +21,7 @@ #include "mgmt.h" #include "tsched.h" #include "tutil.h" +#pragma GCC diagnostic ignored "-Wpointer-sign" int mgmtSendVPeersMsg(SVgObj *pVgroup, SDbObj *pDb); char *mgmtBuildVpeersIe(char *pMsg, SVgObj *pVgroup, SDbObj *pDb); diff --git a/src/system/src/mgmtMeter.c b/src/system/src/mgmtMeter.c index 921f104d14..7c46f9f9a8 100644 --- a/src/system/src/mgmtMeter.c +++ b/src/system/src/mgmtMeter.c @@ -516,7 +516,6 @@ int mgmtCreateMeter(SDbObj *pDb, SCreateTableMsg *pCreate) { STabObj * pMetric = NULL; SVgObj * pVgroup = NULL; int size = 0; - SAcctObj *pAcct = NULL; int numOfTables = sdbGetNumOfRows(meterSdb); if (numOfTables >= tsMaxTables) { diff --git a/src/system/src/mgmtShell.c b/src/system/src/mgmtShell.c index 8d3c0246bf..ef09e88249 100644 --- a/src/system/src/mgmtShell.c +++ b/src/system/src/mgmtShell.c @@ -22,6 +22,8 @@ #include "mgmt.h" #include "mgmtProfile.h" #include "tlog.h" +#pragma GCC diagnostic ignored "-Wint-conversion" +#pragma GCC diagnostic ignored "-Wpointer-sign" void * pShellConn = NULL; SConnObj *connList; diff --git a/src/system/src/mgmtVgroup.c b/src/system/src/mgmtVgroup.c index 3577153067..1afcea17ad 100644 --- a/src/system/src/mgmtVgroup.c +++ b/src/system/src/mgmtVgroup.c @@ -17,6 +17,7 @@ #include "mgmt.h" #include "tschemautil.h" +#pragma GCC diagnostic ignored "-Wunused-variable" void * vgSdb = NULL; int tsVgUpdateSize; diff --git a/src/system/src/vnodeImport.c b/src/system/src/vnodeImport.c index b81b603a4c..657001351c 100644 --- a/src/system/src/vnodeImport.c +++ b/src/system/src/vnodeImport.c @@ -25,6 +25,8 @@ #include "vnodeMgmt.h" #include "vnodeShell.h" #include "vnodeUtil.h" +#pragma GCC diagnostic ignored "-Wpointer-sign" +#pragma GCC diagnostic ignored "-Wint-conversion" typedef struct { SCompHeader *headList; @@ -61,7 +63,6 @@ typedef struct { int rows; } SImportInfo; -#define EXTRA_BYTES 8 int vnodeImportData(SMeterObj *pObj, SImportInfo *pImport); int vnodeGetImportStartPart(SMeterObj *pObj, char *payload, int rows, TSKEY key1) { diff --git a/src/system/src/vnodeMeter.c b/src/system/src/vnodeMeter.c index 9f4b3ec3d8..04dc22f7d6 100644 --- a/src/system/src/vnodeMeter.c +++ b/src/system/src/vnodeMeter.c @@ -27,6 +27,8 @@ #include "vnodeShell.h" #include "vnodeUtil.h" +#pragma GCC diagnostic ignored "-Wpointer-sign" + #define VALID_TIMESTAMP(key, curKey, prec) (((key) >= 0) && ((key) <= ((curKey) + 36500 * tsMsPerDay[prec]))) int tsMeterSizeOnFile; diff --git a/src/system/src/vnodeRead.c b/src/system/src/vnodeRead.c index aee4580da7..4fbafb7ab4 100644 --- a/src/system/src/vnodeRead.c +++ b/src/system/src/vnodeRead.c @@ -25,6 +25,7 @@ #include "vnode.h" #include "vnodeRead.h" #include "vnodeUtil.h" +#pragma GCC diagnostic ignored "-Wint-conversion" int (*pQueryFunc[])(SMeterObj *, SQuery *) = {vnodeQueryFromCache, vnodeQueryFromFile}; diff --git a/src/system/src/vnodeShell.c b/src/system/src/vnodeShell.c index 5384b3cad7..6998d440a3 100644 --- a/src/system/src/vnodeShell.c +++ b/src/system/src/vnodeShell.c @@ -28,6 +28,7 @@ #include "vnode.h" #include "vnodeRead.h" #include "vnodeUtil.h" +#pragma GCC diagnostic ignored "-Wint-conversion" void * pShellServer = NULL; SShellObj **shellList = NULL; @@ -216,7 +217,6 @@ int vnodeSendShellSubmitRspMsg(SShellObj *pObj, int code, int numOfPoints) { int vnodeProcessQueryRequest(char *pMsg, int msgLen, SShellObj *pObj) { int ret, code = 0; - SMeterObj * pMeterObj = NULL; SQueryMeterMsg * pQueryMsg; SMeterSidExtInfo **pSids = NULL; int32_t incNumber = 0; diff --git a/src/system/src/vnodeStore.c b/src/system/src/vnodeStore.c index e7154e0700..29d4b46e8b 100644 --- a/src/system/src/vnodeStore.c +++ b/src/system/src/vnodeStore.c @@ -26,6 +26,8 @@ #include "vnodeStore.h" #include "vnodeUtil.h" +#pragma GCC diagnostic ignored "-Wformat-overflow=" + int vnodeCreateMeterObjFile(int vnode); int tsMaxVnode = -1; diff --git a/src/system/src/vnodeUtil.c b/src/system/src/vnodeUtil.c index 02af8d0c02..f68038ba1c 100644 --- a/src/system/src/vnodeUtil.c +++ b/src/system/src/vnodeUtil.c @@ -24,6 +24,8 @@ #include "vnodeDataFilterFunc.h" #include "vnodeUtil.h" +#pragma GCC diagnostic ignored "-Wint-conversion" + int vnodeCheckFileIntegrity(FILE* fp) { /* int savedSessions, savedMeterSize; diff --git a/src/util/src/tcrc32c.c b/src/util/src/tcrc32c.c index d071f407d2..5c484994a5 100644 --- a/src/util/src/tcrc32c.c +++ b/src/util/src/tcrc32c.c @@ -23,6 +23,7 @@ #include "tcrc32c.h" //todo : use the original source code +#pragma GCC diagnostic ignored "-Wunused-function" #define POLY 0x82f63b78 #define LONG_SHIFT 8192 diff --git a/src/util/src/ttime.c b/src/util/src/ttime.c index a60c60bba0..962601c409 100644 --- a/src/util/src/ttime.c +++ b/src/util/src/ttime.c @@ -14,7 +14,7 @@ */ #define _XOPEN_SOURCE -#define _BSD_SOURCE +#define _DEFAULT_SOURCE #include #include -- GitLab