Skip to content

in_winevtlog: out_s3: Fix windows build failures #9293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edsiper merged 2 commits into from
Aug 28, 2024
Merged

in_winevtlog: out_s3: Fix windows build failures #9293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6f988c
out_s3: Plug an error for too many argument for mkdir
cosmo0920 Aug 28, 2024
76032e5
in_winevtlog: Remove a needless third argument
cosmo0920 Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/in_winevtlog/pack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ static void pack_string_inserts(struct winevtlog_config *ctx, PEVT_VARIANT value
}
break;
case EvtVarTypeEvtXml:
if (pack_wstr(ctx, values[i].XmlVal, ctx)) {
if (pack_wstr(ctx, values[i].XmlVal)) {
pack_nullstr(ctx);
}
break;
Expand Down
4 changes: 4 additions & 0 deletions plugins/out_s3/s3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,11 @@ static int init_seq_index(void *context) {
}

/* Create directory path if it doesn't exist */
#ifdef FLB_SYSTEM_WINDOWS
ret = mkdir(ctx->metadata_dir);
#else
ret = mkdir(ctx->metadata_dir, 0700);
#endif
if (ret < 0 && errno != EEXIST) {
flb_plg_error(ctx->ins, "Failed to create metadata directory");
return -1;
Expand Down