Skip to content

Commit 1954d18

Browse files
authored
Merge pull request ceph#65707 from a16bitsysop/crimson-gcc15
crimson: admin: fix FTBFS with gcc 15 Reviewed-by: Matan Breizman <[email protected]>
2 parents fe52553 + bf25307 commit 1954d18

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/crimson/admin/admin_socket.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,14 +155,14 @@ seastar::future<> AdminSocket::execute_line(std::string cmdline,
155155
LOG_PREFIX(AdminSocket::execute_line);
156156
INFO("");
157157
return execute_command({std::move(cmdline)}, {}).then([FNAME, &out, this](auto result) {
158-
auto [ret, stderr, stdout] = std::move(result);
158+
auto [ret, err_out, out_str] = std::move(result);
159159
if (ret < 0) {
160160
ERROR("{}", cpp_strerror(ret));
161-
stdout.append(fmt::format("ERROR: {}\n", cpp_strerror(ret)));
162-
stdout.append(stderr);
161+
out_str.append(fmt::format("ERROR: {}\n", cpp_strerror(ret)));
162+
out_str.append(err_out);
163163
}
164164
DEBUG("finalizing response");
165-
return finalize_response(out, std::move(stdout));
165+
return finalize_response(out, std::move(out_str));
166166
});
167167
}
168168

0 commit comments

Comments
 (0)