File 2044-esock-preloaded-Dialyzer-cleanup.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2044-esock-preloaded-Dialyzer-cleanup.patch of Package erlang (Revision f11a8876faa0a8240b9c8df85bc35eb2)

Currently displaying revision f11a8876faa0a8240b9c8df85bc35eb2 , Show latest

From 8b2144cec19dca01d238cd295e1c2bbe4706ffd5 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Thu, 11 Nov 2021 17:39:35 +0100
Subject: [PATCH 44/58] [esock|preloaded] Dialyzer "cleanup"

OTP-17528
---
 erts/preloaded/ebin/prim_socket.beam | Bin 36236 -> 36592 bytes
 erts/preloaded/src/prim_socket.erl   |  17 ++++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/erts/preloaded/src/prim_socket.erl b/erts/preloaded/src/prim_socket.erl
index d434f6f3cd..ec92aeb4bf 100644
--- a/erts/preloaded/src/prim_socket.erl
+++ b/erts/preloaded/src/prim_socket.erl
@@ -792,7 +792,7 @@ getopt_result(Error, _Option) ->
 
 getopt_native(SockRef, Option, ValueSpec) ->
     NativeValue = 1,
-    case enc_sockopt(Option, NativeValue) of
+    try enc_sockopt(Option, NativeValue) of
         undefined ->
             {error, {invalid, {socket_option, Option}}};
         invalid ->
@@ -806,6 +806,8 @@ getopt_native(SockRef, Option, ValueSpec) ->
                     end;
                 Result -> Result
             end
+    catch throw : Reason ->
+            {error, Reason}
     end.
 
 %% ----------------------------------
@@ -889,7 +891,10 @@ enc_ioctl_flags(Flags, Table) ->
 	   (Flag, BadSetOrReset, _) ->
 		invalid_ioctl_flag({Flag, BadSetOrReset})
 	end,
-    maps:fold(F, #{}, Flags).
+    try maps:fold(F, #{}, Flags)
+    catch throw : Reason ->
+            {error, Reason}
+    end.
 
 
 %% These clauses should be deprecated
@@ -1090,14 +1095,20 @@ enc_sockopt(Option, _NativeValue) ->
 
 %% ===========================================================================
 
+-spec invalid_socket_option(Opt :: term()) -> no_return().
+
 invalid_socket_option(Opt) ->
     invalid({socket_option, Opt}).
 
+-spec invalid_ioctl_flag(Flag :: term()) -> no_return().
+
 invalid_ioctl_flag(Flag) ->
     invalid({ioctl_flag, Flag}).
 
+-spec invalid(What :: term()) -> no_return().
+
 invalid(What) ->
-    erlang:error({invalid, What}).
+    throw({invalid, What}).
 
 
 
-- 
2.31.1

Places

File 2044-esock-preloaded-Dialyzer-cleanup.patch of Package erlang (Revision f11a8876faa0a8240b9c8df85bc35eb2)

Places