Thanks to visit codestin.com
Credit goes to github.com

Skip to content

snmp: replace size/1 by xxx_size/1 #6800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kikofernandez merged 1 commit into from
Feb 6, 2023
Merged

snmp: replace size/1 by xxx_size/1 #6800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/snmp/src/agent/snmp_generic_mnesia.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@ make_row2(RowList, 1) -> RowList;
make_row2([_OtherIndex | RowList], N) ->
make_row2(RowList, N-1).

make_row_list(Row) ->
make_row_list(size(Row), Row, []).
make_row_list(Row) when is_tuple(Row) ->
make_row_list(tuple_size(Row), Row, []).
make_row_list(N, Row, Acc) when N > 2 ->
make_row_list(N-1, Row, [element(N, Row) | Acc]);
make_row_list(2, Row, Acc) ->
Expand Down
2 changes: 1 addition & 1 deletion lib/snmp/src/agent/snmp_index.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ is_snmp_type(_) -> false.
key_to_oid_i(Key, _Type) when is_integer(Key) -> [Key];
key_to_oid_i(Key, fix_string) -> Key;
key_to_oid_i(Key, _Type) when is_list(Key) -> [length(Key) | Key];
key_to_oid_i(Key, Types) -> keys_to_oid(size(Key), Key, [], Types).
key_to_oid_i(Key, Types) when is_tuple(Key) -> keys_to_oid(tuple_size(Key), Key, [], Types).

keys_to_oid(0, _Key, Oid, _Types) -> Oid;
keys_to_oid(N, Key, Oid, Types) ->
Expand Down
2 changes: 1 addition & 1 deletion lib/snmp/src/agent/snmpa_local_db.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,7 +1031,7 @@ table_get_elements(NameDb, RowIndex, Cols, _FirstOwnIndex) ->

get_elements(_Cols, undefined) ->
undefined;
get_elements([Col | Cols], Row) when is_tuple(Row) and (size(Row) >= Col) ->
get_elements([Col | Cols], Row) when tuple_size(Row) >= Col ->
[element(Col, Row) | get_elements(Cols, Row)];
get_elements([], _Row) ->
[];
Expand Down
16 changes: 8 additions & 8 deletions lib/snmp/src/agent/snmpa_mib_data_ttln.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,18 +777,18 @@ next_node(_D, undefined_node, _Oid, _RevOidSoFar, _MibView) ->

next_node(_D, {tree, Tree, {table_entry, _Id}}, [Int | _Oid],
_RevOidSoFar, _MibView)
when Int+1 > size(Tree) ->
when Int+1 > tuple_size(Tree) ->
?vtrace("next_node(tree,table_entry) -> entry when not found within"
"~n Int: ~p"
"~n size(Tree): ~p", [Int, size(Tree)]),
"~n size(Tree): ~p", [Int, tuple_size(Tree)]),
false;
next_node(D, {tree, Tree, {table_entry, _MibName}},
Oid, RevOidSoFar, MibView) ->
?vtrace("next_node(tree,table_entry) -> entry when"
"~n size(Tree): ~p"
"~n Oid: ~p"
"~n RevOidSoFar: ~p"
"~n MibView: ~p", [size(Tree), Oid, RevOidSoFar, MibView]),
"~n MibView: ~p", [tuple_size(Tree), Oid, RevOidSoFar, MibView]),
OidSoFar = lists:reverse(RevOidSoFar),
case snmpa_acm:is_definitely_not_in_mib_view(OidSoFar, MibView) of
true ->
Expand All @@ -809,14 +809,14 @@ next_node(D, {tree, Tree, {table_entry, _MibName}},
end;

next_node(D, {tree, Tree, _Info}, [Int | RestOfOid], RevOidSoFar, MibView)
when (Int < size(Tree)) andalso (Int >= 0) ->
when (Int < tuple_size(Tree)) andalso (Int >= 0) ->
?vtrace("next_node(tree) -> entry when"
"~n size(Tree): ~p"
"~n Int: ~p"
"~n RestOfOid: ~p"
"~n RevOidSoFar: ~p"
"~n MibView: ~p",
[size(Tree), Int, RestOfOid, RevOidSoFar, MibView]),
[tuple_size(Tree), Int, RestOfOid, RevOidSoFar, MibView]),
case next_node(D, element(Int+1,Tree),
RestOfOid, [Int|RevOidSoFar], MibView) of
false ->
Expand All @@ -830,11 +830,11 @@ next_node(D, {tree, Tree, _Info}, [], RevOidSoFar, MibView) ->
"~n size(Tree): ~p"
"~n RevOidSoFar: ~p"
"~n MibView: ~p",
[size(Tree), RevOidSoFar, MibView]),
[tuple_size(Tree), RevOidSoFar, MibView]),
find_next(D, {tree, Tree, _Info}, 0, RevOidSoFar, MibView);
next_node(_D, {tree, Tree, _Info}, _RestOfOid, _RevOidSoFar, _MibView) ->
?vtrace("next_node(tree) -> entry when"
"~n size(Tree): ~p", [size(Tree)]),
"~n size(Tree): ~p", [tuple_size(Tree)]),
false;

next_node(D, {node, subagent}, Oid, RevOidSoFar, MibView) ->
Expand Down Expand Up @@ -896,7 +896,7 @@ next_node(_D, {node, {variable, _MibName}}, _Oid, _RevOidSoFar, _MibView) ->
%% node.
%%-----------------------------------------------------------------
find_next(D, {tree, Tree, internal}, Idx, RevOidSoFar, MibView)
when Idx < size(Tree) ->
when Idx < tuple_size(Tree) ->
case find_next(D, element(Idx+1, Tree), 0, [Idx| RevOidSoFar], MibView) of
false ->
find_next(D, {tree, Tree, internal}, Idx+1, RevOidSoFar, MibView);
Expand Down
16 changes: 8 additions & 8 deletions lib/snmp/src/agent/snmpa_mib_data_tttn.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,18 +804,18 @@ next_node(_D, undefined_node, _Oid, _RevOidSoFar, _MibView) ->

next_node(_D, {tree, Tree, {table_entry, _Id}}, [Int | _Oid],
_RevOidSoFar, _MibView)
when Int+1 > size(Tree) ->
when Int+1 > tuple_size(Tree) ->
?vtrace("next_node(tree,table_entry) -> entry when not found within"
"~n Int: ~p"
"~n size(Tree): ~p", [Int, size(Tree)]),
"~n size(Tree): ~p", [Int, tuple_size(Tree)]),
false;
next_node(D, {tree, Tree, {table_entry, _MibName}},
Oid, RevOidSoFar, MibView) ->
?vtrace("next_node(tree,table_entry) -> entry when"
"~n size(Tree): ~p"
"~n Oid: ~p"
"~n RevOidSoFar: ~p"
"~n MibView: ~p", [size(Tree), Oid, RevOidSoFar, MibView]),
"~n MibView: ~p", [tuple_size(Tree), Oid, RevOidSoFar, MibView]),
OidSoFar = lists:reverse(RevOidSoFar),
case snmpa_acm:is_definitely_not_in_mib_view(OidSoFar, MibView) of
true ->
Expand All @@ -836,14 +836,14 @@ next_node(D, {tree, Tree, {table_entry, _MibName}},
end;

next_node(D, {tree, Tree, _Info}, [Int | RestOfOid], RevOidSoFar, MibView)
when (Int < size(Tree)) andalso (Int >= 0) ->
when (Int < tuple_size(Tree)) andalso (Int >= 0) ->
?vtrace("next_node(tree) -> entry when"
"~n size(Tree): ~p"
"~n Int: ~p"
"~n RestOfOid: ~p"
"~n RevOidSoFar: ~p"
"~n MibView: ~p",
[size(Tree), Int, RestOfOid, RevOidSoFar, MibView]),
[tuple_size(Tree), Int, RestOfOid, RevOidSoFar, MibView]),
case next_node(D, element(Int+1,Tree),
RestOfOid, [Int|RevOidSoFar], MibView) of
false ->
Expand All @@ -857,11 +857,11 @@ next_node(D, {tree, Tree, _Info}, [], RevOidSoFar, MibView) ->
"~n size(Tree): ~p"
"~n RevOidSoFar: ~p"
"~n MibView: ~p",
[size(Tree), RevOidSoFar, MibView]),
[tuple_size(Tree), RevOidSoFar, MibView]),
find_next(D, {tree, Tree, _Info}, 0, RevOidSoFar, MibView);
next_node(_D, {tree, Tree, _Info}, _RestOfOid, _RevOidSoFar, _MibView) ->
?vtrace("next_node(tree) -> entry when"
"~n size(Tree): ~p", [size(Tree)]),
"~n size(Tree): ~p", [tuple_size(Tree)]),
false;

next_node(D, {node, subagent}, Oid, RevOidSoFar, MibView) ->
Expand Down Expand Up @@ -924,7 +924,7 @@ next_node(_D, {node, {variable, _MibName}}, _Oid, _RevOidSoFar, _MibView) ->
%% node.
%%-----------------------------------------------------------------
find_next(D, {tree, Tree, internal}, Idx, RevOidSoFar, MibView)
when Idx < size(Tree) ->
when Idx < tuple_size(Tree) ->
case find_next(D, element(Idx+1, Tree), 0, [Idx| RevOidSoFar], MibView) of
false ->
find_next(D, {tree, Tree, internal}, Idx+1, RevOidSoFar, MibView);
Expand Down
9 changes: 5 additions & 4 deletions lib/snmp/src/agent/snmpa_mpd.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@ generate_response_msg(Vsn, RePdu, Type,
{discarded, Reason};
Packet ->
MMS = get_engine_max_message_size(LocalEngineID),
case size(Packet) of
case byte_size(Packet) of
Len when Len =< MMS ->
Log(Type, Packet),
inc_snmp_cnt_vars(Type, RePdu),
Expand Down Expand Up @@ -742,7 +742,7 @@ generate_response_msg(Vsn, RePdu, Type,
%% because of the calculation we do when we
%% receive the bulk-request.
Packet = list_to_binary(OutMsg),
case size(Packet) of
case byte_size(Packet) of
Len when Len =< AgentMS ->
if
SecLevel =:= 3 ->
Expand Down Expand Up @@ -932,7 +932,7 @@ generate_msg(Vsn, _NoteStore, Pdu, {community, Community}, LocalEngineID, To) ->
{discarded, Reason};
Packet ->
AgentMax = get_engine_max_message_size(LocalEngineID),
case size(Packet) of
case byte_size(Packet) of
Len when Len =< AgentMax ->
{ok, mk_v1_v2_packet_list(To, Packet, Len, Pdu)};
Len ->
Expand Down Expand Up @@ -1321,7 +1321,7 @@ mk_v3_packet_entry(NoteStore, Domain, Addr,
%% Store in cache for 150 sec.
Packet = list_to_binary(OutMsg),
?vdebug("mk_v3_packet_entry -> generated: ~w bytes",
[size(Packet)]),
[byte_size(Packet)]),
Data =
if
SecLevel =:= 3 ->
Expand Down Expand Up @@ -1560,3 +1560,4 @@ user_err(F, A) ->

config_err(F, A) ->
snmpa_error:config_err(F, A).

2 changes: 1 addition & 1 deletion lib/snmp/src/manager/snmpm_net_if.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ maybe_handle_recv_msg_mt(


handle_recv_msg(Domain, Addr, Bytes, #state{server = Pid})
when is_binary(Bytes) andalso (size(Bytes) =:= 0) ->
when is_binary(Bytes) andalso (byte_size(Bytes) =:= 0) ->
Pid ! {snmp_error, {empty_message, Domain, Addr}, Domain, Addr};
%%
handle_recv_msg(
Expand Down
4 changes: 2 additions & 2 deletions lib/snmp/src/misc/snmp_pdus.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,8 +828,8 @@ enint(N, Acc) ->

enc_oct_str_tag(OStr) when is_list(OStr) ->
lists:append([4|elength(length(OStr))],OStr);
enc_oct_str_tag(OBin) ->
[4 | elength(size(OBin))] ++ binary_to_list(OBin).
enc_oct_str_tag(OBin) when is_binary(OBin) ->
[4 | elength(byte_size(OBin))] ++ binary_to_list(OBin).


enc_oct_str_notag(OStr) -> OStr.
Expand Down