Skip to content

Commit 4f76091

Browse files
feat: manual review and update of missing changes
Signed-off-by: Patrick Stephens <pat@telemetryforge.io>
1 parent 60f8991 commit 4f76091

8 files changed

Lines changed: 37 additions & 1631 deletions

File tree

source/plugins/in_splunk/splunk_prot.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,7 +1062,8 @@ int splunk_prot_handle(struct flb_splunk *ctx, struct splunk_conn *conn,
10621062

10631063
if (ret < 0) {
10641064
send_json_message_response(conn, 400, "{\"text\":\"Invalid data format\",\"code\":6}");
1065-
} else {
1065+
}
1066+
else {
10661067
send_json_message_response(conn, 200, "{\"text\":\"Success\",\"code\":0}");
10671068
}
10681069
}
@@ -1087,7 +1088,8 @@ int splunk_prot_handle(struct flb_splunk *ctx, struct splunk_conn *conn,
10871088

10881089
if (ret < 0) {
10891090
send_json_message_response(conn, 400, "{\"text\":\"Invalid data format\",\"code\":6}");
1090-
} else {
1091+
}
1092+
else {
10911093
send_json_message_response(conn, 200, "{\"text\":\"Success\",\"code\":0}");
10921094
}
10931095
}
@@ -1476,4 +1478,4 @@ int splunk_prot_handle_ng(struct flb_http_request *request,
14761478
flb_sds_destroy(tag);
14771479

14781480
return ret;
1479-
}
1481+
}

source/src/config_format/flb_cf_yaml.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,9 @@ static enum status state_copy_into_properties(struct parser_state *state, struct
920920
struct cfl_variant *var;
921921
struct cfl_variant *variant;
922922
struct cfl_array *arr;
923-
int idx;
923+
size_t idx;
924+
size_t entry_count;
925+
int array_all_strings;
924926

925927
cfl_list_foreach(head, &state->keyvals->list) {
926928
kvp = cfl_list_entry(head, struct cfl_kvpair, _head);

source/src/flb_engine.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,6 @@ int flb_engine_start(struct flb_config *config)
963963
return -1;
964964
}
965965

966-
967966
/* Initialize filter plugins */
968967
ret = flb_filter_init_all(config);
969968
if (ret == -1) {

source/src/flb_storage.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include <fluent-bit/flb_scheduler.h>
2525
#include <fluent-bit/flb_utils.h>
2626
#include <fluent-bit/flb_http_server.h>
27-
#include <limits.h>
2827

2928
static struct cmt *metrics_context_create(struct flb_storage_metrics *sm)
3029
{
@@ -619,11 +618,9 @@ int flb_storage_input_create(struct cio_ctx *cio,
619618
si->type = in->storage_type;
620619
in->storage = si;
621620

622-
623621
return 0;
624622
}
625623

626-
627624
void flb_storage_input_destroy(struct flb_input_instance *in)
628625
{
629626
struct mk_list *tmp;
@@ -767,7 +764,6 @@ int flb_storage_create(struct flb_config *ctx)
767764
/* print storage info */
768765
print_storage_info(ctx, cio);
769766

770-
771767
return 0;
772768
}
773769

0 commit comments

Comments
 (0)