]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
crimson: admin: fix FTBFS with gcc 15
authorDuncan Bellamy <dunk@denkimushi.com>
Mon, 29 Sep 2025 06:47:58 +0000 (06:47 +0000)
committerDuncan Bellamy <dunk@denkimushi.com>
Mon, 29 Sep 2025 06:47:58 +0000 (06:47 +0000)
replace stdout and stderr variable names in src/crimson/admin/admin_socket.cc with names that do not clash with the global constant pointers

Fixes: https://tracker.ceph.com/issues/73291
Signed-off-by: Duncan Bellamy <dunk@denkimushi.com>
src/crimson/admin/admin_socket.cc

index 4bebf5de4e72705c93bb180f8a5c4e14a22b5f59..36f744fddeef11aac34db817adbac106befe39d4 100644 (file)
@@ -155,14 +155,14 @@ seastar::future<> AdminSocket::execute_line(std::string cmdline,
   LOG_PREFIX(AdminSocket::execute_line);
   INFO("");
   return execute_command({std::move(cmdline)}, {}).then([FNAME, &out, this](auto result) {
-     auto [ret, stderr, stdout] = std::move(result);
+     auto [ret, err_out, out_str] = std::move(result);
      if (ret < 0) {
        ERROR("{}", cpp_strerror(ret));
-       stdout.append(fmt::format("ERROR: {}\n", cpp_strerror(ret)));
-       stdout.append(stderr);
+       out_str.append(fmt::format("ERROR: {}\n", cpp_strerror(ret)));
+       out_str.append(err_out);
      }
      DEBUG("finalizing response");
-     return finalize_response(out, std::move(stdout));
+     return finalize_response(out, std::move(out_str));
   });
 }