in_tail: fixups for rebasing onto master

nigels-com · nigels-com · commit 85b3f919cbac · 2020-05-12T21:16:42.000+10:00
Signed-off-by: Nigel Stewart &lt;nigels@nigels.com&gt;
diff --git a/plugins/in_syslog/syslog_conf.c b/plugins/in_syslog/syslog_conf.c
@@ -115,7 +115,7 @@ struct flb_syslog *syslog_conf_create(struct flb_input_instance *ins,
     }
 
     /* Config: Text encoding other than UTF-8 */
-    tmp = flb_input_get_property("encoding", i_ins);
+    tmp = flb_input_get_property("encoding", ins);
     if (tmp) {
         ctx->encoding = flb_get_encoder(tmp);
         if (!ctx->encoding) {
diff --git a/plugins/in_tail/tail_config.c b/plugins/in_tail/tail_config.c
@@ -160,7 +160,7 @@ struct flb_tail_config *flb_tail_config_create(struct flb_input_instance *ins,
     }
 
     /* Config: Text encoding other than UTF-8 */
-    tmp = flb_input_get_property("encoding", i_ins);
+    tmp = flb_input_get_property("encoding", ins);
     if (tmp) {
         ctx->encoding = flb_get_encoder(tmp);
         if (!ctx->encoding) {
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -108,12 +108,14 @@ if(FLB_HTTP_CLIENT_DEBUG)
   set(src
     ${src}
     "flb_http_client_debug.c"
+    )
 endif()
 
 if(FLB_UTF8_ENCODER)
   set(src
     ${src}
     "flb_encoder.c"
+    )
 endif()
 
 if(FLB_LUAJIT)

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ struct flb_syslog syslog_conf_create(struct flb_input_instance ins,`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`/* Config: Text encoding other than UTF-8 */`
`118`		`- tmp = flb_input_get_property("encoding", i_ins);`
	`118`	`+ tmp = flb_input_get_property("encoding", ins);`
`119`	`119`	`if (tmp) {`
`120`	`120`	`ctx->encoding = flb_get_encoder(tmp);`
`121`	`121`	`if (!ctx->encoding) {`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ struct flb_tail_config flb_tail_config_create(struct flb_input_instance ins,`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`/* Config: Text encoding other than UTF-8 */`
`163`		`- tmp = flb_input_get_property("encoding", i_ins);`
	`163`	`+ tmp = flb_input_get_property("encoding", ins);`
`164`	`164`	`if (tmp) {`
`165`	`165`	`ctx->encoding = flb_get_encoder(tmp);`
`166`	`166`	`if (!ctx->encoding) {`