Merging upstream version 2.1.1.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-08 12:06:41 +01:00
parent 4feb155734
commit 14c3c7c9ac
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
58 changed files with 177 additions and 159 deletions

View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016-2022, OARC, Inc.
* Copyright (c) 2016-2023, OARC, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -241,8 +241,6 @@ int dumper_close(my_bpftimeval ts)
dumper = FALSE;
}
} else if (options.dump_format == cbor) {
int ret;
if (dump_type == to_stdout) {
ret = dump_cbor(stdout);
@ -265,8 +263,6 @@ int dumper_close(my_bpftimeval ts)
}
}
} else if (options.dump_format == cds) {
int ret;
if (dump_type == to_stdout) {
ret = dump_cds(stdout);