Use recover() directly

hexis-revival · Oct 27, 2024 · 770b1d4 · 770b1d4
1 parent d424405
commit 770b1d4
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/hnet/parsers.go b/hnet/parsers.go
@@ -7,7 +7,7 @@ import (
 )
 
 func ReadLoginRequest(stream *common.IOStream) *LoginRequest {
-	defer handlePanic()
+	defer recover()
 
 	username := stream.ReadString()
 	password := stream.ReadString()
@@ -34,7 +34,7 @@ func ReadLoginRequest(stream *common.IOStream) *LoginRequest {
 }
 
 func ReadLoginRequestReconnect(stream *common.IOStream) *LoginRequest {
-	defer handlePanic()
+	defer recover()
 
 	username := stream.ReadString()
 	password := stream.ReadString()
@@ -82,7 +82,7 @@ func ParseClientInfo(clientInfoString string) *ClientInfo {
 }
 
 func ReadStatusChange(stream *common.IOStream) *Status {
-	defer handlePanic()
+	defer recover()
 
 	status := &Status{
 		UserId:  stream.ReadU32(),
@@ -106,15 +106,15 @@ func ReadStatusChange(stream *common.IOStream) *Status {
 }
 
 func ReadStatsRequest(stream *common.IOStream) *StatsRequest {
-	defer handlePanic()
+	defer recover()
 
 	return &StatsRequest{
 		UserIds: stream.ReadIntList(),
 	}
 }
 
 func ReadRelationshipRequest(stream *common.IOStream) *RelationshipRequest {
-	defer handlePanic()
+	defer recover()
 
 	status := common.StatusBlocked
 	isFriend := stream.ReadBool()
@@ -129,7 +129,3 @@ func ReadRelationshipRequest(stream *common.IOStream) *RelationshipRequest {
 		UserId: userId,
 	}
 }
-
-func handlePanic() {
-	_ = recover()
-}