From 794d4b20807afc8041e7b6537fd8581675fa8fac Mon Sep 17 00:00:00 2001 From: SisMaker <1713699517@qq.com> Date: Sat, 29 Jul 2023 23:24:24 +0800 Subject: [PATCH] =?UTF-8?q?ft:=20IIF=E6=94=B9=E6=88=90CASE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/wsCom.hrl | 2 +- src/eWSrv.erl | 2 +- src/wsSrv/wsHttpProtocol.erl | 2 +- src/wsSrv/wsTPHer.erl | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/wsCom.hrl b/include/wsCom.hrl index 696f3fb..17753d7 100644 --- a/include/wsCom.hrl +++ b/include/wsCom.hrl @@ -19,7 +19,7 @@ , {backlog, 4096} ]). --define(IIF(Cond, Then, That), case Cond of true -> Then; _ -> That end). +-define(CASE(Cond, Then, That), case Cond of true -> Then; _ -> That end). -export_type([ sendfile_opts/0 diff --git a/src/eWSrv.erl b/src/eWSrv.erl index 2da13f4..95a4fcb 100644 --- a/src/eWSrv.erl +++ b/src/eWSrv.erl @@ -57,5 +57,5 @@ openSrv(WSrvName, Port, WsOpts) -> end. closeSrv(WSrvNameOrPort) -> - WSrvName = ?IIF(is_integer(WSrvNameOrPort), wSrvName(WSrvNameOrPort), WSrvNameOrPort), + WSrvName = ?CASE(is_integer(WSrvNameOrPort), wSrvName(WSrvNameOrPort), WSrvNameOrPort), eNet:close(WSrvName). \ No newline at end of file diff --git a/src/wsSrv/wsHttpProtocol.erl b/src/wsSrv/wsHttpProtocol.erl index 04ff3cb..cec158f 100644 --- a/src/wsSrv/wsHttpProtocol.erl +++ b/src/wsSrv/wsHttpProtocol.erl @@ -53,7 +53,7 @@ request(header, Data, Socket, State) -> request(header, Rest, Socket, State#wsState{buffer = Rest, headerCnt = NewHeaderCnt, temHeader = NewTemHeader, contentLength = ContentLength}) end; 'Transfer-Encoding' -> - IsChunked = ?IIF(Value == <<"chunked">> orelse Value == <<"Chunked">>, true, false), + IsChunked = ?CASE(Value == <<"chunked">> orelse Value == <<"Chunked">>, true, false), case IsChunked of true -> case ChunkedSupp of diff --git a/src/wsSrv/wsTPHer.erl b/src/wsSrv/wsTPHer.erl index 3e2c234..a509bb9 100644 --- a/src/wsSrv/wsTPHer.erl +++ b/src/wsSrv/wsTPHer.erl @@ -273,12 +273,12 @@ close_chunk(Ref) -> %% If the referenced process is dead, return early with `{error, closed}', %% instead of timing out. send_chunk(Ref, Data) -> - ?IIF(is_ref_alive(Ref), + ?CASE(is_ref_alive(Ref), send_chunk(Ref, Data, 5000), {error, closed}). is_ref_alive(Ref) -> - ?IIF(node(Ref) =:= node(), + ?CASE(node(Ref) =:= node(), is_process_alive(Ref), erpc:call(node(Ref), erlang, is_process_alive, [Ref])).