2025-02-09 22:39:58 +00:00
From: Jan Engelhardt <ej@inai.de>
Date: 2025-02-09 21:28:54.517217439 +0100
Fix some terrible code.
[ 28s] /home/abuild/rpmbuild/BUILD/grpc-1.70.1-build/grpc-1.70.1/src/core/lib/transport/call_state.h:157:3: error: control reaches end of non-void function [-Werror=return-type]
---
2025-07-27 12:05:47 +00:00
src/core/call/call_state.h | 5 +++++
src/core/channelz/channelz.h | 1 +
src/core/lib/promise/inter_activity_mutex.h | 2 ++
3 files changed, 8 insertions(+)
2025-02-09 22:39:58 +00:00
2025-11-11 18:18:32 +00:00
Index: grpc-1.76.0/src/core/call/call_state.h
2025-02-09 22:39:58 +00:00
===================================================================
2025-11-11 18:18:32 +00:00
--- grpc-1.76.0.orig/src/core/call/call_state.h
+++ grpc-1.76.0/src/core/call/call_state.h
2025-07-27 12:05:47 +00:00
@@ -155,6 +155,7 @@ class CallState {
2025-02-09 22:39:58 +00:00
case ClientToServerPullState::kTerminated:
return "Terminated";
}
+ return "Undefined";
}
template <typename Sink>
friend void AbslStringify(Sink& out, ClientToServerPullState state) {
2025-07-27 12:05:47 +00:00
@@ -185,6 +186,7 @@ class CallState {
2025-02-09 22:39:58 +00:00
case ClientToServerPushState::kFinished:
return "Finished";
}
+ return "Undefined";
}
template <typename Sink>
friend void AbslStringify(Sink& out, ClientToServerPushState state) {
2025-07-27 12:05:47 +00:00
@@ -235,6 +237,7 @@ class CallState {
2025-02-09 22:39:58 +00:00
case ServerToClientPullState::kTerminated:
return "Terminated";
}
+ return "Undefined";
}
template <typename Sink>
friend void AbslStringify(Sink& out, ServerToClientPullState state) {
2025-07-27 12:05:47 +00:00
@@ -275,6 +278,7 @@ class CallState {
2025-02-09 22:39:58 +00:00
case ServerToClientPushState::kFinished:
return "Finished";
}
+ return "Undefined";
}
template <typename Sink>
friend void AbslStringify(Sink& out, ServerToClientPushState state) {
2025-07-27 12:05:47 +00:00
@@ -305,6 +309,7 @@ class CallState {
2025-02-09 22:39:58 +00:00
case ServerTrailingMetadataState::kPulledCancel:
return "PulledCancel";
}
+ return "Undefined";
}
template <typename Sink>
friend void AbslStringify(Sink& out, ServerTrailingMetadataState state) {
2025-11-11 18:18:32 +00:00
Index: grpc-1.76.0/src/core/channelz/channelz.h
2025-07-27 12:05:47 +00:00
===================================================================
2025-11-11 18:18:32 +00:00
--- grpc-1.76.0.orig/src/core/channelz/channelz.h
+++ grpc-1.76.0/src/core/channelz/channelz.h
@@ -173,6 +173,7 @@ class BaseNode : public DualRefCounted<B
case EntityType::kResourceQuota:
return "resource_quota";
2025-07-27 12:05:47 +00:00
}
+ return "unknown";
}
static std::optional<EntityType> KindToEntityType(absl::string_view kind) {
2025-11-11 18:18:32 +00:00
Index: grpc-1.76.0/src/core/lib/promise/inter_activity_mutex.h
2025-07-27 12:05:47 +00:00
===================================================================
2025-11-11 18:18:32 +00:00
--- grpc-1.76.0.orig/src/core/lib/promise/inter_activity_mutex.h
+++ grpc-1.76.0/src/core/lib/promise/inter_activity_mutex.h
2025-07-27 12:05:47 +00:00
@@ -307,6 +307,8 @@ class InterActivityMutex {
case State::kMovedFrom:
LOG(FATAL) << "Mutex acquirer already moved from";
}
+ // Control never actually reaches here
+ return Pending{};
}
private: