[TD-19] refactor http module

src/plugins/http/src/gcHandle.c

@@ -13,11 +13,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gcHandle.h"
+#define _DEFAULT_SOURCE
+#include "os.h"
 #include "cJSON.h"
+#include "httpLog.h"
+#include "gcHandle.h"
 #include "gcJson.h"
 #include "taosdef.h"
-#include "httpLog.h"
 
 static HttpDecodeMethod gcDecodeMethod = {"grafana", gcProcessRequest};
 static HttpEncodeMethod gcHeartBeatMethod = {NULL, gcSendHeartBeatResp, NULL, NULL, NULL, NULL, NULL, NULL};

src/plugins/http/src/gcJson.c

@@ -13,10 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdint.h>
-#include <string.h>
-#include <unistd.h>
-
+#define _DEFAULT_SOURCE
+#include "os.h"
 #include "gcHandle.h"
 #include "gcJson.h"
 #include "httpJson.h"

src/plugins/http/src/httpAuth.c

@@ -13,12 +13,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _DEFAULT_SOURCE
 #include "os.h"
+#include "tkey.h"
 #include "tutil.h"
 #include "http.h"
 #include "httpLog.h"
 #include "httpHandle.h"
-#include "tkey.h"
+
 #define KEY_DES_4 4971256377704625728L
 
 bool httpParseBasicAuthToken(HttpContext *pContext, char *token, int len) {

src/plugins/http/src/httpCode.c

@@ -13,6 +13,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _DEFAULT_SOURCE
+
+
 char* httpMsg[] = {
     "success",                                 // 0
     "http server is not online",               // 1

src/plugins/http/src/httpHandle.c

@@ -13,21 +13,18 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <arpa/inet.h>
-#include <stdint.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "http.h"
-#include "httpCode.h"
-#include "httpHandle.h"
-#include "httpResp.h"
-#include "shash.h"
+#define _DEFAULT_SOURCE
+#include "os.h"
 #include "taos.h"
 #include "tglobal.h"
 #include "tsocket.h"
 #include "ttimer.h"
+#include "shash.h"
+#include "http.h"
 #include "httpLog.h"
+#include "httpCode.h"
+#include "httpHandle.h"
+#include "httpResp.h"
 
 void httpToLowerUrl(char* url) {
   /*ignore case */

src/plugins/http/src/httpJson.c

@@ -13,20 +13,15 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <netinet/in.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosmsg.h"
+#include "taoserror.h"
 #include "http.h"
+#include "httpLog.h"
 #include "httpCode.h"
 #include "httpJson.h"
 #include "httpResp.h"
-#include "taosmsg.h"
-#include "httpLog.h"
-#include "taoserror.h"
 
 #define MAX_NUM_STR_SZ 25
 

src/plugins/http/src/httpResp.c

@@ -13,14 +13,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taoserror.h"
+#include "taosmsg.h"
+#include "httpLog.h"
 #include "httpResp.h"
-#include <stdio.h>
-#include <string.h>
 #include "httpCode.h"
 #include "httpJson.h"
-#include "taosmsg.h"
-#include "httpLog.h"
-#include "taoserror.h"
 
 const char *httpKeepAliveStr[] = {"", "Connection: Keep-Alive\r\n", "Connection: Close\r\n"};
 

src/plugins/http/src/httpServer.c

@@ -13,6 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _DEFAULT_SOURCE
 #include "os.h"
 #include "taosmsg.h"
 #include "tsocket.h"

src/plugins/http/src/httpSession.c

@@ -13,20 +13,18 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-#include "http.h"
-#include "httpCode.h"
-#include "httpHandle.h"
-#include "httpResp.h"
-
+#define _DEFAULT_SOURCE
+#include "os.h"
 #include "shash.h"
 #include "taos.h"
 #include "ttime.h"
 #include "ttimer.h"
+#include "http.h"
 #include "httpLog.h"
+#include "httpCode.h"
+#include "httpHandle.h"
+#include "httpResp.h"
+
 
 void httpAccessSession(HttpContext *pContext) {
   HttpServer *server = pContext->pThread->pServer;

src/plugins/http/src/httpSql.c

@@ -13,15 +13,16 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _DEFAULT_SOURCE
 #include "os.h"
+#include "tnote.h"
+#include "taos.h"
+#include "tsclient.h"
 #include "http.h"
+#include "httpLog.h"
 #include "httpCode.h"
 #include "httpHandle.h"
 #include "httpResp.h"
-#include "taos.h"
-#include "tsclient.h"
-#include "tnote.h"
-#include "httpLog.h"
 
 void *taos_connect_a(char *ip, char *user, char *pass, char *db, uint16_t port, void (*fp)(void *, TAOS_RES *, int),
                      void *param, void **taos);

src/plugins/http/src/httpSystem.c

@@ -15,17 +15,17 @@
 
 #define _DEFAULT_SOURCE
 #include "os.h"
+#include "shash.h"
+#include "taos.h"
+#include "tglobal.h"
+#include "tsocket.h"
+#include "ttimer.h"
 #include "tadmin.h"
 #include "http.h"
 #include "httpCode.h"
 #include "httpHandle.h"
 #include "httpResp.h"
 #include "httpLog.h"
-#include "shash.h"
-#include "taos.h"
-#include "tglobal.h"
-#include "tsocket.h"
-#include "ttimer.h"
 #include "gcHandle.h"
 #include "httpHandle.h"
 #include "restHandle.h"

src/plugins/http/src/httpUtil.c

@@ -13,15 +13,16 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _DEFAULT_SOURCE
 #include "os.h"
 #include "tmd5.h"
+#include "shash.h"
+#include "taos.h"
 #include "http.h"
+#include "httpLog.h"
 #include "httpCode.h"
 #include "httpHandle.h"
 #include "httpResp.h"
-#include "shash.h"
-#include "taos.h"
-#include "httpLog.h"
 
 bool httpCheckUsedbSql(char *sql) {
   if (strstr(sql, "use ") != NULL) {

src/plugins/http/src/restHandle.c

@@ -13,9 +13,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "httpLog.h"
 #include "restHandle.h"
 #include "restJson.h"
-#include "httpLog.h"
 
 static HttpDecodeMethod restDecodeMethod = {"rest", restProcessRequest};
 static HttpDecodeMethod restDecodeMethod2 = {"restful", restProcessRequest};

src/plugins/http/src/restJson.c

@@ -13,6 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _DEFAULT_SOURCE
 #include "os.h"
 #include "tglobal.h"
 #include "httpLog.h"

src/plugins/http/src/tgHandle.c

@@ -13,14 +13,15 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _DEFAULT_SOURCE
 #include "os.h"
-#include "tgHandle.h"
+#include "tglobal.h"
 #include "shash.h"
+#include "taosdef.h"
 #include "taosmsg.h"
+#include "tgHandle.h"
 #include "tgJson.h"
-#include "taosdef.h"
 #include "httpLog.h"
-#include "tglobal.h"
 
 /*
  * taos.telegraf.cfg formats like

src/plugins/http/src/tgJson.c

@@ -13,13 +13,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _DEFAULT_SOURCE
 #include "os.h"
+#include "taosmsg.h"
+#include "httpLog.h"
 #include "httpJson.h"
 #include "httpResp.h"
-#include "taosmsg.h"
 #include "tgHandle.h"
 #include "tgJson.h"
-#include "httpLog.h"
 
 void tgInitQueryJson(HttpContext *pContext) {
   JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);