Fix broken build

Author: dedok

ngx_http_tnt_module.c

@@ -6,7 +6,6 @@
 #include <ngx_core.h>
 #include <ngx_http.h>
 
-#include <tp.h>
 #include <tp_transcode.h>
 
 

tp_transcode.c

@@ -2,9 +2,7 @@
 #include <inttypes.h>
 #include <stdio.h>
 
-
 #define MP_SOURCE 1
-
 #include "tp.h"
 #include "tp_transcode.h"
 
@@ -37,8 +35,8 @@ while (0)
 typedef struct {
 	char *ptr;
 	int16_t count;
-#define TYPE_MAP	1
-#define TYPE_ARRAY	2
+#define TYPE_MAP    1
+#define TYPE_ARRAY 2
 	int type;
 } stack_item_t;
 
@@ -459,7 +457,7 @@ yajl_json2tp_transcode(void *ctx, const char *input, size_t input_size)
 	if (mp_unlikely(stat != yajl_status_ok)) {
 
 		if (!s_ctx->tc->errmsg[0]) {
-	        unsigned char *err;
+			unsigned char *err;
 			stat = yajl_complete_parse(s_ctx->hand);
 			err = yajl_get_error(s_ctx->hand, 0, input_, input_size);
 			say_error(s_ctx, "%s", err);
@@ -857,3 +855,18 @@ tp_transcode_init(tp_transcode_t *t, char *output, size_t output_size,
 
 	return TP_TRANSCODE_OK;
 }
+
+ssize_t
+tp_read_payload(const char * const buf, const char * const end)
+{
+	const size_t size = end - buf;
+	if (size == 0 || size < 6)
+		return 0;
+	const char *p = buf, *test = buf;
+	if (mp_check(&test, buf + size))
+		return -1;
+	if (mp_typeof(*p) != MP_UINT)
+		return -1;
+	return mp_decode_uint(&p) + p - buf;
+}
+

tp_transcode.h

@@ -5,6 +5,7 @@
 extern "C" {
 #endif
 
+
 /* {{{ API declaration */
 struct tp_transcode;
 
@@ -67,6 +68,9 @@ typedef struct tp_transcode {
 #define TP_TRANSCODE_ERROR 2
 #define TP_TRANSCODE_AGAIN 3
 
+ssize_t
+tp_read_payload(const char * const buf, const char * const end);
+
 /**
  * Initialize struct tp_transcode.
  * Returns TP_TRANSCODE_ERROR if codec not found or create codec failed
@@ -102,7 +106,7 @@ tp_dump(char *output, size_t output_size, char *input, size_t input_size);
 static inline int
 tp_transcode_complete(tp_transcode_t *t, size_t *complete_msg_size)
 {
-	if (mp_likely(t != NULL)) {
+	if (t != NULL) {
 		const int rc = t->codec.complete(t->codec.ctx, complete_msg_size);
 		t->codec.free(t->codec.ctx);
 		return rc;
@@ -113,7 +117,7 @@ tp_transcode_complete(tp_transcode_t *t, size_t *complete_msg_size)
 static inline int
 tp_transcode(tp_transcode_t *t, char *b, size_t size)
 {
-	if (mp_likely(t != NULL))
+	if (t != NULL)
 		return t->codec.transcode(t->codec.ctx, b, size);
 	return TP_TRANSCODE_ERROR;
 }
@@ -123,11 +127,11 @@ tp_dump(char *output, size_t output_size, char *input, size_t input_size)
 {
 	tp_transcode_t t;
 	if (tp_transcode_init(&t, output, output_size, TP_TO_JSON)
-      == TP_TRANSCODE_ERROR)
+			== TP_TRANSCODE_ERROR)
 		return false;
 
 	if (tp_transcode(&t, input, input_size) == TP_TRANSCODE_ERROR)
-    return false;
+		return false;
 
 	size_t complete_msg_size = 0;
 	tp_transcode_complete(&t, &complete_msg_size);
@@ -136,21 +140,6 @@ tp_dump(char *output, size_t output_size, char *input, size_t input_size)
 	return complete_msg_size > 0;
 }
 
-static inline ssize_t
-tp_read_payload(const char * const buf, const char * const end)
-{
-	const size_t size = end - buf;
-	if (size == 0 || size < 6)
-		return 0;
-	const char *p = buf, *test = buf;
-	memset(r, 0, sizeof(struct tpresponse));
-	if (mp_check(&test, buf + size))
-		return -1;
-	if (mp_typeof(*p) != MP_UINT)
-		return -1;
-	return mp_decode_uint(&p) + p - buf;
-}
-
 #ifdef __cplusplus
 } /* extern "C" */
 #endif