File 5038-kernel-test-Replaced-use-of-catch-with-try-catch-ine.patch of Package erlang

From 5aec2ae0176c2ac9146c38786d96fcd1118593fd Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Wed, 4 Mar 2026 11:38:38 +0100
Subject: [PATCH 8/8] [kernel|test] Replaced use of 'catch' with 'try catch'
 (inet)

---
 lib/kernel/test/inet_SUITE.erl         | 19 ++++++++++--------
 lib/kernel/test/inet_res_SUITE.erl     |  4 ++--
 lib/kernel/test/inet_sockopt_SUITE.erl | 27 +++++++++++++++-----------
 3 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/lib/kernel/test/inet_SUITE.erl b/lib/kernel/test/inet_SUITE.erl
index deb420bb70..49f4873db8 100644
--- a/lib/kernel/test/inet_SUITE.erl
+++ b/lib/kernel/test/inet_SUITE.erl
@@ -3,7 +3,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2025. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2026. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1133,11 +1133,14 @@ spawn_gethosters(Hostname, N) ->
     [spawn(fun() ->
 		   receive 
 		       go ->
-			   case (catch inet:gethostbyname(Hostname)) of
+			   try inet:gethostbyname(Hostname) of
 			       {ok,_} ->
 				   Collector ! ok;
 			       Else ->
-				   Collector ! {error,Else}
+				   Collector ! {error, Else}
+			   catch
+			       C:E ->
+				   Collector ! {error, {catched, C, E}}
 			   end
 		   end 
 	   end) | 
@@ -1190,7 +1193,7 @@ wait_for_gethost(0) ->
     exit(gethost_not_found);
 wait_for_gethost(N) ->
     {ok,Hostname} = inet:gethostname(),
-    case (catch inet:gethostbyname(Hostname)) of
+    case ?CATCH_AND_RETURN( inet:gethostbyname(Hostname) ) of
 	{ok,_} ->
 	    ok;
 	Otherwise ->
@@ -2635,9 +2638,9 @@ do_socknames_tcp1(Conf, Addr) ->
 	    exit({skip, {accepted_socket, Reason3}})
     end,
     ?P("close socket(s)"),
-    (catch gen_tcp:close(S3)),
-    (catch gen_tcp:close(S2)),
-    (catch gen_tcp:close(S1)),
+    ?CATCH_AND_IGNORE( gen_tcp:close(S3) ),
+    ?CATCH_AND_IGNORE( gen_tcp:close(S2) ),
+    ?CATCH_AND_IGNORE( gen_tcp:close(S1) ),
     ?P("done"),
     ok.
 
@@ -2701,7 +2704,7 @@ do_socknames_udp1(Conf, Addr) ->
     ?P("enable debug"),
     inet:setopts(S1, [{debug, true}]),
     ?P("close socket"),
-    (catch gen_udp:close(S1)),
+    ?CATCH_AND_IGNORE( gen_udp:close(S1) ),
     ?P("done"),
     ok.
 
diff --git a/lib/kernel/test/inet_res_SUITE.erl b/lib/kernel/test/inet_res_SUITE.erl
index 0125dfb42c..68b0ea9321 100644
--- a/lib/kernel/test/inet_res_SUITE.erl
+++ b/lib/kernel/test/inet_res_SUITE.erl
@@ -1693,11 +1693,11 @@ tsig_server(_Config, DigDrill) ->
                         gen_tcp:close(Sock)
                 catch
                     Class : Reason : Stacktrace ->
-                        _ = catch gen_tcp:close(Sock),
+                        _ = ?CATCH_AND_IGNORE( gen_tcp:close(Sock) ),
                         {Class,Reason,Stacktrace}
                 end;
             Error ->
-                _ = catch gen_tcp:close(LSock),
+                _ = ?CATCH_AND_IGNORE( gen_tcp:close(LSock) ),
                 Error
         end,
 
diff --git a/lib/kernel/test/inet_sockopt_SUITE.erl b/lib/kernel/test/inet_sockopt_SUITE.erl
index 1bcfd81281..f9f18c6330 100644
--- a/lib/kernel/test/inet_sockopt_SUITE.erl
+++ b/lib/kernel/test/inet_sockopt_SUITE.erl
@@ -1028,21 +1028,25 @@ type_errors(Config) when is_list(Config) ->
 	 {linger,banan}
 	],
     lists:foreach(fun(Option) ->
-			  case
-			      catch create_socketpair(Config, [Option], []) of
-			      {'EXIT',badarg} ->
-				  ok;
+			  try create_socketpair(Config, [Option], []) of
 			      Unexpected1 ->
 				  exit({unexpected,
 					Unexpected1})
+			  catch
+			      exit:badarg ->
+				  ?P("~s -> catched expected (exit) badarg",
+				     [?FUNCTION_NAME]),
+				  ok
 			  end,
-			  case
-			      catch create_socketpair(Config, [], [Option]) of
-			      {'EXIT', badarg} ->
-				  ok;
+			  try create_socketpair(Config, [], [Option]) of
 			      Unexpected2 ->
 				  exit({unexpected,
 					Unexpected2})
+			  catch
+			      exit:badarg ->
+				  ?P("~s -> catched expected (exit) badarg",
+				     [?FUNCTION_NAME]),
+				  ok
 			  end,
 			  {Sock1,Sock2} = create_socketpair(Config, [], []),
 			  case inet:setopts(Sock1, [Option]) of
@@ -1237,7 +1241,8 @@ make_check_fun(_Config) ->
                     gen_udp:close(S1),
                     gen_udp:close(S2)
                 end
-            catch Class : Reason : Stacktrace ->
+            catch
+		Class : Reason : Stacktrace ->
                     erlang:raise(Class, {fail,Reason,Spec}, Stacktrace)
             end
     end.
@@ -1414,7 +1419,7 @@ ask_helper(Port,Code) ->
     end.
 
 stop_helper(Port) ->
-    catch ask_helper(Port,?C_QUIT),
+    ?CATCH_AND_IGNORE( ask_helper(Port,?C_QUIT) ),
     receive
 	{Port,eof} ->
 	    Port ! {self(), close},
-- 
2.51.0