Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Remove whitespaces #86

Closed
wants to merge 1 commit into from

3 participants

@ymn

Some minor change: remove deprecated whitespaces from sources.

@zinid
Collaborator

One can merge this. But I'm against this as I don't see problems with namespaces (I'm not a nasty pedant).
Also there is ELDAPv3.erl changed which is not recommended because it's autogenerated file and can be re-generated at any time in the future.

@zinid
Collaborator

s/namespaces/whitespaces/

@badlop badlop closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jul 26, 2013
  1. @ymn

    Remove whitespaces

    ymn authored
This page is out of date. Refresh to see the latest.
Showing with 348 additions and 349 deletions.
  1. +1 −1  contrib/extract_translations/extract_translations.erl
  2. +7 −7 contrib/extract_translations/prepare-translation.sh
  3. +4 −4 examples/mtr/ejabberd-netbsd.sh
  4. +146 −146 src/ELDAPv3.erl
  5. +2 −3 src/ejabberd_admin.erl
  6. +2 −2 src/ejabberd_auth.erl
  7. +2 −2 src/ejabberd_c2s.erl
  8. +4 −4 src/ejabberd_commands.erl
  9. +3 −3 src/ejabberd_config.erl
  10. +6 −6 src/ejabberd_http_poll.erl
  11. +2 −2 src/ejabberd_odbc.erl
  12. +3 −3 src/ejabberd_sm.erl
  13. +8 −8 src/ejabberd_update.erl
  14. +1 −1  src/ejabberd_web.erl
  15. +19 −19 src/eldap.erl
  16. +24 −24 src/eldap_utils.erl
  17. +1 −1  src/gen_mod.erl
  18. +1 −1  src/jlib.erl
  19. +6 −6 src/mod_announce.erl
  20. +19 −19 src/mod_carboncopy.erl
  21. +3 −3 src/mod_echo.erl
  22. +2 −2 src/mod_muc.erl
  23. +1 −1  src/mod_muc_log.erl
  24. +6 −6 src/mod_muc_room.erl
  25. +4 −4 src/mod_pubsub.erl
  26. +6 −6 src/mod_pubsub_odbc.erl
  27. +2 −2 src/mod_roster.erl
  28. +1 −1  src/mod_time.erl
  29. +1 −1  src/mod_vcard.erl
  30. +1 −1  src/mod_vcard_xupdate.erl
  31. +4 −4 src/node.template
  32. +2 −2 src/node_buddy.erl
  33. +2 −2 src/node_club.erl
  34. +2 −2 src/node_dispatch.erl
  35. +2 −2 src/node_flat.erl
  36. +2 −2 src/node_flat_odbc.erl
  37. +6 −6 src/node_hometree.erl
  38. +2 −2 src/node_hometree_odbc.erl
  39. +2 −2 src/node_mb.erl
  40. +3 −3 src/node_pep.erl
  41. +3 −3 src/node_pep_odbc.erl
  42. +2 −2 src/node_private.erl
  43. +2 −2 src/node_public.erl
  44. +3 −3 src/nodetree_tree.erl
  45. +3 −3 src/nodetree_tree_odbc.erl
  46. +2 −2 src/nodetree_virtual.erl
  47. +13 −13 src/p1_fsm.erl
  48. +2 −2 src/pubsub_index.erl
  49. +1 −1  test/ldap_srv.erl
  50. +2 −2 tools/captcha.sh
View
2  contrib/extract_translations/extract_translations.erl
@@ -128,7 +128,7 @@ parse_form(Dir, File, Form, Used) ->
_ ->
ok
end.
-
+
process_string(_Dir, _File, _Line, "", _Used) ->
ok;
View
14 contrib/extract_translations/prepare-translation.sh
@@ -25,12 +25,12 @@ prepare_dirs ()
MSGS_DIR=$EJA_DIR/priv/msgs
if !([[ -n $EJA_DIR ]])
- then
+ then
echo "ejabberd dir does not exist: $EJA_DIR"
fi
if !([[ -x $EXTRACT_BEAM ]])
- then
+ then
sh -c "cd $EXTRACT_DIR; $ERL -compile $EXTRACT_ERL"
fi
}
@@ -48,7 +48,7 @@ extract_lang ()
cd $SRC_DIR
$ERL -pa $EXTRACT_DIR -noinput -noshell -s extract_translations -s init stop -extra . $MSGS_PATH >$MSGS_PATH.new
sed -e 's/^% \.\//% /g;' $MSGS_PATH.new > $MSGS_PATH.new2
- mv $MSGS_PATH.new2 $MSGS_PATH.new
+ mv $MSGS_PATH.new2 $MSGS_PATH.new
echo -n " old..."
$ERL -pa $EXTRACT_DIR -noinput -noshell -s extract_translations -s init stop -extra -unused . $MSGS_PATH >$MSGS_PATH.unused
@@ -126,7 +126,7 @@ find_unused_full ()
cp $DELFILE2 $DELFILE1
STRING=`head -1 $DELFILE1`
- until [[ $STRING == ENDFILEMARK ]]; do
+ until [[ $STRING == ENDFILEMARK ]]; do
cp $DELFILE2 $DELFILE1
cp $DATFILE2 $DATFILE1
@@ -202,7 +202,7 @@ extract_lang_popot2po ()
POT_PATH=$MSGS_DIR/$PROJECT.pot
msgmerge $PO_PATH $POT_PATH >$PO_PATH.translate 2>/dev/null
- mv $PO_PATH.translate $PO_PATH
+ mv $PO_PATH.translate $PO_PATH
}
extract_lang_po2msg ()
@@ -240,7 +240,7 @@ extract_lang_po2msg ()
extract_lang_updateall ()
{
echo "Generating POT"
- extract_lang_src2pot
+ extract_lang_src2pot
cd $MSGS_DIR
echo ""
@@ -335,7 +335,7 @@ while [ $# -ne 0 ] ; do
;;
-src2pot)
prepare_dirs
- extract_lang_src2pot
+ extract_lang_src2pot
;;
-po2msg)
LANG_CODE=$1
View
8 examples/mtr/ejabberd-netbsd.sh
@@ -16,7 +16,7 @@ fi
echo '2. install crypt_drv.so'
-
+
if [ ! -d /usr/pkg/lib/erlang/lib/crypto-1.1.2.1/priv/lib ] ; then
mkdir -p /usr/pkg/lib/erlang/lib/crypto-1.1.2.1/priv/lib
fi
@@ -41,7 +41,7 @@ cc -shared \
cp ../priv/obj/i386--netbsdelf/elibcrypto.so \
/usr/pkg/lib/erlang/lib/crypto-1.1.2.1/priv/lib
fi
-
+
echo '4. compile and install ssl_esock'
@@ -49,10 +49,10 @@ if [ ! -f /usr/pkg/lib/erlang/lib/ssl-2.3.5/priv/bin/ssl_esock ]; then
cd /usr/pkg/lib/erlang/lib/ssl-2.3.5/priv/obj/
make
fi
-
+
echo '5. initial ejabberd configuration'
-
+
cd /usr/pkg/jabber/ejabberd/src
./configure
View
292 src/ELDAPv3.erl
@@ -349,7 +349,7 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
'enc_ExtendedRequest'(element(2,Val), [<<119>>]);
extendedResp ->
'enc_ExtendedResponse'(element(2,Val), [<<120>>]);
- Else ->
+ Else ->
exit({error,{asn1,{invalid_choice_type,Else}}})
end,
@@ -361,105 +361,105 @@ Tlv1 = match_tags(Tlv, TagIn),
case (case Tlv1 of [CtempTlv1] -> CtempTlv1; _ -> Tlv1 end) of
%% 'bindRequest'
- {65536, V1} ->
+ {65536, V1} ->
{bindRequest, 'dec_BindRequest'(V1, [])};
%% 'bindResponse'
- {65537, V1} ->
+ {65537, V1} ->
{bindResponse, 'dec_BindResponse'(V1, [])};
%% 'unbindRequest'
- {65538, V1} ->
+ {65538, V1} ->
{unbindRequest, decode_null(V1,[])};
%% 'searchRequest'
- {65539, V1} ->
+ {65539, V1} ->
{searchRequest, 'dec_SearchRequest'(V1, [])};
%% 'searchResEntry'
- {65540, V1} ->
+ {65540, V1} ->
{searchResEntry, 'dec_SearchResultEntry'(V1, [])};
%% 'searchResDone'
- {65541, V1} ->
+ {65541, V1} ->
{searchResDone, 'dec_SearchResultDone'(V1, [])};
%% 'searchResRef'
- {65555, V1} ->
+ {65555, V1} ->
{searchResRef, 'dec_SearchResultReference'(V1, [])};
%% 'modifyRequest'
- {65542, V1} ->
+ {65542, V1} ->
{modifyRequest, 'dec_ModifyRequest'(V1, [])};
%% 'modifyResponse'
- {65543, V1} ->
+ {65543, V1} ->
{modifyResponse, 'dec_ModifyResponse'(V1, [])};
%% 'addRequest'
- {65544, V1} ->
+ {65544, V1} ->
{addRequest, 'dec_AddRequest'(V1, [])};
%% 'addResponse'
- {65545, V1} ->
+ {65545, V1} ->
{addResponse, 'dec_AddResponse'(V1, [])};
%% 'delRequest'
- {65546, V1} ->
+ {65546, V1} ->
{delRequest, decode_restricted_string(V1,[])};
%% 'delResponse'
- {65547, V1} ->
+ {65547, V1} ->
{delResponse, 'dec_DelResponse'(V1, [])};
%% 'modDNRequest'
- {65548, V1} ->
+ {65548, V1} ->
{modDNRequest, 'dec_ModifyDNRequest'(V1, [])};
%% 'modDNResponse'
- {65549, V1} ->
+ {65549, V1} ->
{modDNResponse, 'dec_ModifyDNResponse'(V1, [])};
%% 'compareRequest'
- {65550, V1} ->
+ {65550, V1} ->
{compareRequest, 'dec_CompareRequest'(V1, [])};
%% 'compareResponse'
- {65551, V1} ->
+ {65551, V1} ->
{compareResponse, 'dec_CompareResponse'(V1, [])};
%% 'abandonRequest'
- {65552, V1} ->
+ {65552, V1} ->
{abandonRequest, decode_integer(V1,{0,2147483647},[])};
%% 'extendedReq'
- {65559, V1} ->
+ {65559, V1} ->
{extendedReq, 'dec_ExtendedRequest'(V1, [])};
%% 'extendedResp'
- {65560, V1} ->
+ {65560, V1} ->
{extendedResp, 'dec_ExtendedResponse'(V1, [])};
- Else ->
+ Else ->
exit({error,{asn1,{invalid_choice_tag,Else}}})
end
.
@@ -470,20 +470,20 @@ case (case Tlv1 of [CtempTlv1] -> CtempTlv1; _ -> Tlv1 end) of
'dec_LDAPMessage'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
%%-------------------------------------------------
%% attribute messageID(1) with type INTEGER
%%-------------------------------------------------
-[V1|Tlv2] = Tlv1,
+[V1|Tlv2] = Tlv1,
Term1 = decode_integer(V1,{0,2147483647},[2]),
%%-------------------------------------------------
%% attribute protocolOp(2) with type CHOICE
%%-------------------------------------------------
-[V2|Tlv3] = Tlv2,
+[V2|Tlv3] = Tlv2,
Term2 = 'dec_LDAPMessage_protocolOp'(V2, []),
%%-------------------------------------------------
@@ -639,7 +639,7 @@ decode_restricted_string(Tlv,TagIn).
{EncBytes,EncLen} = 'enc_AttributeDescriptionList_components'(Val,[],0),
encode_tags(TagIn, EncBytes, EncLen).
-'enc_AttributeDescriptionList_components'([], AccBytes, AccLen) ->
+'enc_AttributeDescriptionList_components'([], AccBytes, AccLen) ->
{lists:reverse(AccBytes),AccLen};
'enc_AttributeDescriptionList_components'([H|T],AccBytes, AccLen) ->
@@ -653,7 +653,7 @@ decode_restricted_string(Tlv,TagIn).
'dec_AttributeDescriptionList'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
[decode_restricted_string(V1,[4]) || V1 <- Tlv1].
@@ -708,20 +708,20 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
'dec_AttributeValueAssertion'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
%%-------------------------------------------------
%% attribute attributeDesc(1) with type OCTET STRING
%%-------------------------------------------------
-[V1|Tlv2] = Tlv1,
+[V1|Tlv2] = Tlv1,
Term1 = decode_restricted_string(V1,[4]),
%%-------------------------------------------------
%% attribute assertionValue(2) with type OCTET STRING
%%-------------------------------------------------
-[V2|Tlv3] = Tlv2,
+[V2|Tlv3] = Tlv2,
Term2 = decode_restricted_string(V2,[4]),
case Tlv3 of
@@ -781,7 +781,7 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
{EncBytes,EncLen} = 'enc_Attribute_vals_components'(Val,[],0),
encode_tags(TagIn, EncBytes, EncLen).
-'enc_Attribute_vals_components'([], AccBytes, AccLen) ->
+'enc_Attribute_vals_components'([], AccBytes, AccLen) ->
{lists:reverse(AccBytes),AccLen};
'enc_Attribute_vals_components'([H|T],AccBytes, AccLen) ->
@@ -790,7 +790,7 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
'dec_Attribute_vals'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
[decode_restricted_string(V1,[4]) || V1 <- Tlv1].
@@ -803,20 +803,20 @@ Tlv1 = match_tags(Tlv, TagIn),
'dec_Attribute'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
%%-------------------------------------------------
%% attribute type(1) with type OCTET STRING
%%-------------------------------------------------
-[V1|Tlv2] = Tlv1,
+[V1|Tlv2] = Tlv1,
Term1 = decode_restricted_string(V1,[4]),
%%-------------------------------------------------
%% attribute vals(2) with type SET OF
%%-------------------------------------------------
-[V2|Tlv3] = Tlv2,
+[V2|Tlv3] = Tlv2,
Term2 = 'dec_Attribute_vals'(V2, [17]),
case Tlv3 of
@@ -928,26 +928,26 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
'dec_LDAPResult'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
%%-------------------------------------------------
%% attribute resultCode(1) with type ENUMERATED
%%-------------------------------------------------
-[V1|Tlv2] = Tlv1,
+[V1|Tlv2] = Tlv1,
Term1 = decode_enumerated(V1,[{success,0},{operationsError,1},{protocolError,2},{timeLimitExceeded,3},{sizeLimitExceeded,4},{compareFalse,5},{compareTrue,6},{authMethodNotSupported,7},{strongAuthRequired,8},{referral,10},{adminLimitExceeded,11},{unavailableCriticalExtension,12},{confidentialityRequired,13},{saslBindInProgress,14},{noSuchAttribute,16},{undefinedAttributeType,17},{inappropriateMatching,18},{constraintViolation,19},{attributeOrValueExists,20},{invalidAttributeSyntax,21},{noSuchObject,32},{aliasProblem,33},{invalidDNSyntax,34},{aliasDereferencingProblem,36},{inappropriateAuthentication,48},{invalidCredentials,49},{insufficientAccessRights,50},{busy,51},{unavailable,52},{unwillingToPerform,53},{loopDetect,54},{namingViolation,64},{objectClassViolation,65},{notAllowedOnNonLeaf,66},{notAllowedOnRDN,67},{entryAlreadyExists,68},{objectClassModsProhibited,69},{affectsMultipleDSAs,71},{other,80}],[10]),
%%-------------------------------------------------
%% attribute matchedDN(2) with type OCTET STRING
%%-------------------------------------------------
-[V2|Tlv3] = Tlv2,
+[V2|Tlv3] = Tlv2,
Term2 = decode_restricted_string(V2,[4]),
%%-------------------------------------------------
%% attribute errorMessage(3) with type OCTET STRING
%%-------------------------------------------------
-[V3|Tlv4] = Tlv3,
+[V3|Tlv4] = Tlv3,
Term3 = decode_restricted_string(V3,[4]),
%%-------------------------------------------------
@@ -977,7 +977,7 @@ end,
{EncBytes,EncLen} = 'enc_Referral_components'(Val,[],0),
encode_tags(TagIn, EncBytes, EncLen).
-'enc_Referral_components'([], AccBytes, AccLen) ->
+'enc_Referral_components'([], AccBytes, AccLen) ->
{lists:reverse(AccBytes),AccLen};
'enc_Referral_components'([H|T],AccBytes, AccLen) ->
@@ -991,7 +991,7 @@ end,
'dec_Referral'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
[decode_restricted_string(V1,[4]) || V1 <- Tlv1].
@@ -1027,7 +1027,7 @@ decode_restricted_string(Tlv,TagIn).
{EncBytes,EncLen} = 'enc_Controls_components'(Val,[],0),
encode_tags(TagIn, EncBytes, EncLen).
-'enc_Controls_components'([], AccBytes, AccLen) ->
+'enc_Controls_components'([], AccBytes, AccLen) ->
{lists:reverse(AccBytes),AccLen};
'enc_Controls_components'([H|T],AccBytes, AccLen) ->
@@ -1041,7 +1041,7 @@ decode_restricted_string(Tlv,TagIn).
'dec_Controls'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
['dec_Control'(V1, [16]) || V1 <- Tlv1].
@@ -1092,14 +1092,14 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
'dec_Control'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
%%-------------------------------------------------
%% attribute controlType(1) with type OCTET STRING
%%-------------------------------------------------
-[V1|Tlv2] = Tlv1,
+[V1|Tlv2] = Tlv1,
Term1 = decode_restricted_string(V1,[4]),
%%-------------------------------------------------
@@ -1163,26 +1163,26 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
'dec_BindRequest'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
%%-------------------------------------------------
%% attribute version(1) with type INTEGER
%%-------------------------------------------------
-[V1|Tlv2] = Tlv1,
+[V1|Tlv2] = Tlv1,
Term1 = decode_integer(V1,{1,127},[2]),
%%-------------------------------------------------
%% attribute name(2) with type OCTET STRING
%%-------------------------------------------------
-[V2|Tlv3] = Tlv2,
+[V2|Tlv3] = Tlv2,
Term2 = decode_restricted_string(V2,[4]),
%%-------------------------------------------------
%% attribute authentication(3) External ELDAPv3:AuthenticationChoice
%%-------------------------------------------------
-[V3|Tlv4] = Tlv3,
+[V3|Tlv4] = Tlv3,
Term3 = 'dec_AuthenticationChoice'(V3, []),
case Tlv4 of
@@ -1204,7 +1204,7 @@ end,
encode_restricted_string(element(2,Val), [<<128>>]);
sasl ->
'enc_SaslCredentials'(element(2,Val), [<<163>>]);
- Else ->
+ Else ->
exit({error,{asn1,{invalid_choice_type,Else}}})
end,
@@ -1221,15 +1221,15 @@ Tlv1 = match_tags(Tlv, TagIn),
case (case Tlv1 of [CtempTlv1] -> CtempTlv1; _ -> Tlv1 end) of
%% 'simple'
- {131072, V1} ->
+ {131072, V1} ->
{simple, decode_restricted_string(V1,[])};
%% 'sasl'
- {131075, V1} ->
+ {131075, V1} ->
{sasl, 'dec_SaslCredentials'(V1, [])};
- Else ->
+ Else ->
exit({error,{asn1,{invalid_choice_tag,Else}}})
end
.
@@ -1268,14 +1268,14 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
'dec_SaslCredentials'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
%%-------------------------------------------------
%% attribute mechanism(1) with type OCTET STRING
%%-------------------------------------------------
-[V1|Tlv2] = Tlv1,
+[V1|Tlv2] = Tlv1,
Term1 = decode_restricted_string(V1,[4]),
%%-------------------------------------------------
@@ -1388,26 +1388,26 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
'dec_BindResponse'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
%%-------------------------------------------------
%% attribute resultCode(1) with type ENUMERATED
%%-------------------------------------------------
-[V1|Tlv2] = Tlv1,
+[V1|Tlv2] = Tlv1,
Term1 = decode_enumerated(V1,[{success,0},{operationsError,1},{protocolError,2},{timeLimitExceeded,3},{sizeLimitExceeded,4},{compareFalse,5},{compareTrue,6},{authMethodNotSupported,7},{strongAuthRequired,8},{referral,10},{adminLimitExceeded,11},{unavailableCriticalExtension,12},{confidentialityRequired,13},{saslBindInProgress,14},{noSuchAttribute,16},{undefinedAttributeType,17},{inappropriateMatching,18},{constraintViolation,19},{attributeOrValueExists,20},{invalidAttributeSyntax,21},{noSuchObject,32},{aliasProblem,33},{invalidDNSyntax,34},{aliasDereferencingProblem,36},{inappropriateAuthentication,48},{invalidCredentials,49},{insufficientAccessRights,50},{busy,51},{unavailable,52},{unwillingToPerform,53},{loopDetect,54},{namingViolation,64},{objectClassViolation,65},{notAllowedOnNonLeaf,66},{notAllowedOnRDN,67},{entryAlreadyExists,68},{objectClassModsProhibited,69},{affectsMultipleDSAs,71},{other,80}],[10]),
%%-------------------------------------------------
%% attribute matchedDN(2) with type OCTET STRING
%%-------------------------------------------------
-[V2|Tlv3] = Tlv2,
+[V2|Tlv3] = Tlv2,
Term2 = decode_restricted_string(V2,[4]),
%%-------------------------------------------------
%% attribute errorMessage(3) with type OCTET STRING
%%-------------------------------------------------
-[V3|Tlv4] = Tlv3,
+[V3|Tlv4] = Tlv3,
Term3 = decode_restricted_string(V3,[4]),
%%-------------------------------------------------
@@ -1525,56 +1525,56 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
'dec_SearchRequest'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
%%-------------------------------------------------
%% attribute baseObject(1) with type OCTET STRING
%%-------------------------------------------------
-[V1|Tlv2] = Tlv1,
+[V1|Tlv2] = Tlv1,
Term1 = decode_restricted_string(V1,[4]),
%%-------------------------------------------------
%% attribute scope(2) with type ENUMERATED
%%-------------------------------------------------
-[V2|Tlv3] = Tlv2,
+[V2|Tlv3] = Tlv2,
Term2 = decode_enumerated(V2,[{baseObject,0},{singleLevel,1},{wholeSubtree,2}],[10]),
%%-------------------------------------------------
%% attribute derefAliases(3) with type ENUMERATED
%%-------------------------------------------------
-[V3|Tlv4] = Tlv3,
+[V3|Tlv4] = Tlv3,
Term3 = decode_enumerated(V3,[{neverDerefAliases,0},{derefInSearching,1},{derefFindingBaseObj,2},{derefAlways,3}],[10]),
%%-------------------------------------------------
%% attribute sizeLimit(4) with type INTEGER
%%-------------------------------------------------
-[V4|Tlv5] = Tlv4,
+[V4|Tlv5] = Tlv4,
Term4 = decode_integer(V4,{0,2147483647},[2]),
%%-------------------------------------------------
%% attribute timeLimit(5) with type INTEGER
%%-------------------------------------------------
-[V5|Tlv6] = Tlv5,
+[V5|Tlv6] = Tlv5,
Term5 = decode_integer(V5,{0,2147483647},[2]),
%%-------------------------------------------------
%% attribute typesOnly(6) with type BOOLEAN
%%-------------------------------------------------
-[V6|Tlv7] = Tlv6,
+[V6|Tlv7] = Tlv6,
Term6 = decode_boolean(V6,[1]),
%%-------------------------------------------------
%% attribute filter(7) External ELDAPv3:Filter
%%-------------------------------------------------
-[V7|Tlv8] = Tlv7,
+[V7|Tlv8] = Tlv7,
Term7 = 'dec_Filter'(V7, []),
%%-------------------------------------------------
%% attribute attributes(8) External ELDAPv3:AttributeDescriptionList
%%-------------------------------------------------
-[V8|Tlv9] = Tlv8,
+[V8|Tlv9] = Tlv8,
Term8 = 'dec_AttributeDescriptionList'(V8, [16]),
case Tlv9 of
@@ -1612,7 +1612,7 @@ end,
'enc_AttributeValueAssertion'(element(2,Val), [<<168>>]);
extensibleMatch ->
'enc_MatchingRuleAssertion'(element(2,Val), [<<169>>]);
- Else ->
+ Else ->
exit({error,{asn1,{invalid_choice_type,Else}}})
end,
@@ -1629,7 +1629,7 @@ encode_tags(TagIn, EncBytes, EncLen).
{EncBytes,EncLen} = 'enc_Filter_and_components'(Val,[],0),
encode_tags(TagIn, EncBytes, EncLen).
-'enc_Filter_and_components'([], AccBytes, AccLen) ->
+'enc_Filter_and_components'([], AccBytes, AccLen) ->
{lists:reverse(AccBytes),AccLen};
'enc_Filter_and_components'([H|T],AccBytes, AccLen) ->
@@ -1638,7 +1638,7 @@ encode_tags(TagIn, EncBytes, EncLen).
'dec_Filter_and'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
['dec_Filter'(V1, []) || V1 <- Tlv1].
@@ -1654,7 +1654,7 @@ Tlv1 = match_tags(Tlv, TagIn),
{EncBytes,EncLen} = 'enc_Filter_or_components'(Val,[],0),
encode_tags(TagIn, EncBytes, EncLen).
-'enc_Filter_or_components'([], AccBytes, AccLen) ->
+'enc_Filter_or_components'([], AccBytes, AccLen) ->
{lists:reverse(AccBytes),AccLen};
'enc_Filter_or_components'([H|T],AccBytes, AccLen) ->
@@ -1663,7 +1663,7 @@ Tlv1 = match_tags(Tlv, TagIn),
'dec_Filter_or'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
['dec_Filter'(V1, []) || V1 <- Tlv1].
@@ -1679,55 +1679,55 @@ Tlv1 = match_tags(Tlv, TagIn),
case (case Tlv1 of [CtempTlv1] -> CtempTlv1; _ -> Tlv1 end) of
%% 'and'
- {131072, V1} ->
+ {131072, V1} ->
{'and', 'dec_Filter_and'(V1, [])};
%% 'or'
- {131073, V1} ->
+ {131073, V1} ->
{'or', 'dec_Filter_or'(V1, [])};
%% 'not'
- {131074, V1} ->
+ {131074, V1} ->
{'not', 'dec_Filter'(V1, [])};
%% 'equalityMatch'
- {131075, V1} ->
+ {131075, V1} ->
{equalityMatch, 'dec_AttributeValueAssertion'(V1, [])};
%% 'substrings'
- {131076, V1} ->
+ {131076, V1} ->
{substrings, 'dec_SubstringFilter'(V1, [])};
%% 'greaterOrEqual'
- {131077, V1} ->
+ {131077, V1} ->
{greaterOrEqual, 'dec_AttributeValueAssertion'(V1, [])};
%% 'lessOrEqual'
- {131078, V1} ->
+ {131078, V1} ->
{lessOrEqual, 'dec_AttributeValueAssertion'(V1, [])};
%% 'present'
- {131079, V1} ->
+ {131079, V1} ->
{present, decode_restricted_string(V1,[])};
%% 'approxMatch'
- {131080, V1} ->
+ {131080, V1} ->
{approxMatch, 'dec_AttributeValueAssertion'(V1, [])};
%% 'extensibleMatch'
- {131081, V1} ->
+ {131081, V1} ->
{extensibleMatch, 'dec_MatchingRuleAssertion'(V1, [])};
- Else ->
+ Else ->
exit({error,{asn1,{invalid_choice_tag,Else}}})
end
.
@@ -1765,7 +1765,7 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
{EncBytes,EncLen} = 'enc_SubstringFilter_substrings_components'(Val,[],0),
encode_tags(TagIn, EncBytes, EncLen).
-'enc_SubstringFilter_substrings_components'([], AccBytes, AccLen) ->
+'enc_SubstringFilter_substrings_components'([], AccBytes, AccLen) ->
{lists:reverse(AccBytes),AccLen};
'enc_SubstringFilter_substrings_components'([H|T],AccBytes, AccLen) ->
@@ -1786,7 +1786,7 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
encode_restricted_string(element(2,Val), [<<129>>]);
final ->
encode_restricted_string(element(2,Val), [<<130>>]);
- Else ->
+ Else ->
exit({error,{asn1,{invalid_choice_type,Else}}})
end,
@@ -1798,26 +1798,26 @@ Tlv1 = match_tags(Tlv, TagIn),
case (case Tlv1 of [CtempTlv1] -> CtempTlv1; _ -> Tlv1 end) of
%% 'initial'
- {131072, V1} ->
+ {131072, V1} ->
{initial, decode_restricted_string(V1,[])};
%% 'any'
- {131073, V1} ->
+ {131073, V1} ->
{any, decode_restricted_string(V1,[])};
%% 'final'
- {131074, V1} ->
+ {131074, V1} ->
{final, decode_restricted_string(V1,[])};
- Else ->
+ Else ->
exit({error,{asn1,{invalid_choice_tag,Else}}})
end
.
'dec_SubstringFilter_substrings'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
['dec_SubstringFilter_substrings_SEQOF'(V1, []) || V1 <- Tlv1].
@@ -1830,20 +1830,20 @@ Tlv1 = match_tags(Tlv, TagIn),
'dec_SubstringFilter'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
%%-------------------------------------------------
%% attribute type(1) with type OCTET STRING
%%-------------------------------------------------
-[V1|Tlv2] = Tlv1,
+[V1|Tlv2] = Tlv1,
Term1 = decode_restricted_string(V1,[4]),
%%-------------------------------------------------
%% attribute substrings(2) with type SEQUENCE OF
%%-------------------------------------------------
-[V2|Tlv3] = Tlv2,
+[V2|Tlv3] = Tlv2,
Term2 = 'dec_SubstringFilter_substrings'(V2, [16]),
case Tlv3 of
@@ -1905,7 +1905,7 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
'dec_MatchingRuleAssertion'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
@@ -1932,7 +1932,7 @@ end,
%%-------------------------------------------------
%% attribute matchValue(3) with type OCTET STRING
%%-------------------------------------------------
-[V3|Tlv4] = Tlv3,
+[V3|Tlv4] = Tlv3,
Term3 = decode_restricted_string(V3,[131075]),
%%-------------------------------------------------
@@ -1981,20 +1981,20 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
'dec_SearchResultEntry'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
%%-------------------------------------------------
%% attribute objectName(1) with type OCTET STRING
%%-------------------------------------------------
-[V1|Tlv2] = Tlv1,
+[V1|Tlv2] = Tlv1,
Term1 = decode_restricted_string(V1,[4]),
%%-------------------------------------------------
%% attribute attributes(2) External ELDAPv3:PartialAttributeList
%%-------------------------------------------------
-[V2|Tlv3] = Tlv2,
+[V2|Tlv3] = Tlv2,
Term2 = 'dec_PartialAttributeList'(V2, [16]),
case Tlv3 of
@@ -2014,7 +2014,7 @@ end,
{EncBytes,EncLen} = 'enc_PartialAttributeList_components'(Val,[],0),
encode_tags(TagIn, EncBytes, EncLen).
-'enc_PartialAttributeList_components'([], AccBytes, AccLen) ->
+'enc_PartialAttributeList_components'([], AccBytes, AccLen) ->
{lists:reverse(AccBytes),AccLen};
'enc_PartialAttributeList_components'([H|T],AccBytes, AccLen) ->
@@ -2053,7 +2053,7 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
{EncBytes,EncLen} = 'enc_PartialAttributeList_SEQOF_vals_components'(Val,[],0),
encode_tags(TagIn, EncBytes, EncLen).
-'enc_PartialAttributeList_SEQOF_vals_components'([], AccBytes, AccLen) ->
+'enc_PartialAttributeList_SEQOF_vals_components'([], AccBytes, AccLen) ->
{lists:reverse(AccBytes),AccLen};
'enc_PartialAttributeList_SEQOF_vals_components'([H|T],AccBytes, AccLen) ->
@@ -2062,7 +2062,7 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
'dec_PartialAttributeList_SEQOF_vals'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
[decode_restricted_string(V1,[4]) || V1 <- Tlv1].
@@ -2070,20 +2070,20 @@ Tlv1 = match_tags(Tlv, TagIn),
'dec_PartialAttributeList_SEQOF'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
%%-------------------------------------------------
%% attribute type(1) with type OCTET STRING
%%-------------------------------------------------
-[V1|Tlv2] = Tlv1,
+[V1|Tlv2] = Tlv1,
Term1 = decode_restricted_string(V1,[4]),
%%-------------------------------------------------
%% attribute vals(2) with type SET OF
%%-------------------------------------------------
-[V2|Tlv3] = Tlv2,
+[V2|Tlv3] = Tlv2,
Term2 = 'dec_PartialAttributeList_SEQOF_vals'(V2, [17]),
case Tlv3 of
@@ -2098,7 +2098,7 @@ end,
'dec_PartialAttributeList'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
['dec_PartialAttributeList_SEQOF'(V1, [16]) || V1 <- Tlv1].
@@ -2116,7 +2116,7 @@ Tlv1 = match_tags(Tlv, TagIn),
{EncBytes,EncLen} = 'enc_SearchResultReference_components'(Val,[],0),
encode_tags(TagIn, EncBytes, EncLen).
-'enc_SearchResultReference_components'([], AccBytes, AccLen) ->
+'enc_SearchResultReference_components'([], AccBytes, AccLen) ->
{lists:reverse(AccBytes),AccLen};
'enc_SearchResultReference_components'([H|T],AccBytes, AccLen) ->
@@ -2130,7 +2130,7 @@ Tlv1 = match_tags(Tlv, TagIn),
'dec_SearchResultReference'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
[decode_restricted_string(V1,[4]) || V1 <- Tlv1].
@@ -2188,7 +2188,7 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
{EncBytes,EncLen} = 'enc_ModifyRequest_modification_components'(Val,[],0),
encode_tags(TagIn, EncBytes, EncLen).
-'enc_ModifyRequest_modification_components'([], AccBytes, AccLen) ->
+'enc_ModifyRequest_modification_components'([], AccBytes, AccLen) ->
{lists:reverse(AccBytes),AccLen};
'enc_ModifyRequest_modification_components'([H|T],AccBytes, AccLen) ->
@@ -2224,20 +2224,20 @@ LenSoFar = EncLen1 + EncLen2,
encode_tags(TagIn, BytesSoFar, LenSoFar).
'dec_ModifyRequest_modification_SEQOF'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
%%-------------------------------------------------
%% attribute operation(1) with type ENUMERATED
%%-------------------------------------------------
-[V1|Tlv2] = Tlv1,
+[V1|Tlv2] = Tlv1,
Term1 = decode_enumerated(V1,[{add,0},{delete,1},{replace,2}],[10]),
%%-------------------------------------------------
%% attribute modification(2) External ELDAPv3:AttributeTypeAndValues
%%-------------------------------------------------
-[V2|Tlv3] = Tlv2,
+[V2|Tlv3] = Tlv2,
Term2 = 'dec_AttributeTypeAndValues'(V2, [16]),
case Tlv3 of
@@ -2247,7 +2247,7 @@ end,
'dec_ModifyRequest_modification'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
['dec_ModifyRequest_modification_SEQOF'(V1, [16]) || V1 <- Tlv1].
@@ -2260,20 +2260,20 @@ Tlv1 = match_tags(Tlv, TagIn),
'dec_ModifyRequest'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
%%-------------------------------------------------
%% attribute object(1) with type OCTET STRING
%%-------------------------------------------------
-[V1|Tlv2] = Tlv1,
+[V1|Tlv2] = Tlv1,
Term1 = decode_restricted_string(V1,[4]),
%%-------------------------------------------------
%% attribute modification(2) with type SEQUENCE OF
%%-------------------------------------------------
-[V2|Tlv3] = Tlv2,
+[V2|Tlv3] = Tlv2,
Term2 = 'dec_ModifyRequest_modification'(V2, [16]),
case Tlv3 of
@@ -2315,7 +2315,7 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
{EncBytes,EncLen} = 'enc_AttributeTypeAndValues_vals_components'(Val,[],0),
encode_tags(TagIn, EncBytes, EncLen).
-'enc_AttributeTypeAndValues_vals_components'([], AccBytes, AccLen) ->
+'enc_AttributeTypeAndValues_vals_components'([], AccBytes, AccLen) ->
{lists:reverse(AccBytes),AccLen};
'enc_AttributeTypeAndValues_vals_components'([H|T],AccBytes, AccLen) ->
@@ -2324,7 +2324,7 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
'dec_AttributeTypeAndValues_vals'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
[decode_restricted_string(V1,[4]) || V1 <- Tlv1].
@@ -2337,20 +2337,20 @@ Tlv1 = match_tags(Tlv, TagIn),
'dec_AttributeTypeAndValues'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
%%-------------------------------------------------
%% attribute type(1) with type OCTET STRING
%%-------------------------------------------------
-[V1|Tlv2] = Tlv1,
+[V1|Tlv2] = Tlv1,
Term1 = decode_restricted_string(V1,[4]),
%%-------------------------------------------------
%% attribute vals(2) with type SET OF
%%-------------------------------------------------
-[V2|Tlv3] = Tlv2,
+[V2|Tlv3] = Tlv2,
Term2 = 'dec_AttributeTypeAndValues_vals'(V2, [17]),
case Tlv3 of
@@ -2407,20 +2407,20 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
'dec_AddRequest'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
%%-------------------------------------------------
%% attribute entry(1) with type OCTET STRING
%%-------------------------------------------------
-[V1|Tlv2] = Tlv1,
+[V1|Tlv2] = Tlv1,
Term1 = decode_restricted_string(V1,[4]),
%%-------------------------------------------------
%% attribute attributes(2) External ELDAPv3:AttributeList
%%-------------------------------------------------
-[V2|Tlv3] = Tlv2,
+[V2|Tlv3] = Tlv2,
Term2 = 'dec_AttributeList'(V2, [16]),
case Tlv3 of
@@ -2440,7 +2440,7 @@ end,
{EncBytes,EncLen} = 'enc_AttributeList_components'(Val,[],0),
encode_tags(TagIn, EncBytes, EncLen).
-'enc_AttributeList_components'([], AccBytes, AccLen) ->
+'enc_AttributeList_components'([], AccBytes, AccLen) ->
{lists:reverse(AccBytes),AccLen};
'enc_AttributeList_components'([H|T],AccBytes, AccLen) ->
@@ -2479,7 +2479,7 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
{EncBytes,EncLen} = 'enc_AttributeList_SEQOF_vals_components'(Val,[],0),
encode_tags(TagIn, EncBytes, EncLen).
-'enc_AttributeList_SEQOF_vals_components'([], AccBytes, AccLen) ->
+'enc_AttributeList_SEQOF_vals_components'([], AccBytes, AccLen) ->
{lists:reverse(AccBytes),AccLen};
'enc_AttributeList_SEQOF_vals_components'([H|T],AccBytes, AccLen) ->
@@ -2488,7 +2488,7 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
'dec_AttributeList_SEQOF_vals'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
[decode_restricted_string(V1,[4]) || V1 <- Tlv1].
@@ -2496,20 +2496,20 @@ Tlv1 = match_tags(Tlv, TagIn),
'dec_AttributeList_SEQOF'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
%%-------------------------------------------------
%% attribute type(1) with type OCTET STRING
%%-------------------------------------------------
-[V1|Tlv2] = Tlv1,
+[V1|Tlv2] = Tlv1,
Term1 = decode_restricted_string(V1,[4]),
%%-------------------------------------------------
%% attribute vals(2) with type SET OF
%%-------------------------------------------------
-[V2|Tlv3] = Tlv2,
+[V2|Tlv3] = Tlv2,
Term2 = 'dec_AttributeList_SEQOF_vals'(V2, [17]),
case Tlv3 of
@@ -2524,7 +2524,7 @@ end,
'dec_AttributeList'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
['dec_AttributeList_SEQOF'(V1, [16]) || V1 <- Tlv1].
@@ -2629,26 +2629,26 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
'dec_ModifyDNRequest'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
%%-------------------------------------------------
%% attribute entry(1) with type OCTET STRING
%%-------------------------------------------------
-[V1|Tlv2] = Tlv1,
+[V1|Tlv2] = Tlv1,
Term1 = decode_restricted_string(V1,[4]),
%%-------------------------------------------------
%% attribute newrdn(2) with type OCTET STRING
%%-------------------------------------------------
-[V2|Tlv3] = Tlv2,
+[V2|Tlv3] = Tlv2,
Term2 = decode_restricted_string(V2,[4]),
%%-------------------------------------------------
%% attribute deleteoldrdn(3) with type BOOLEAN
%%-------------------------------------------------
-[V3|Tlv4] = Tlv3,
+[V3|Tlv4] = Tlv3,
Term3 = decode_boolean(V3,[1]),
%%-------------------------------------------------
@@ -2715,20 +2715,20 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
'dec_CompareRequest'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
%%-------------------------------------------------
%% attribute entry(1) with type OCTET STRING
%%-------------------------------------------------
-[V1|Tlv2] = Tlv1,
+[V1|Tlv2] = Tlv1,
Term1 = decode_restricted_string(V1,[4]),
%%-------------------------------------------------
%% attribute ava(2) External ELDAPv3:AttributeValueAssertion
%%-------------------------------------------------
-[V2|Tlv3] = Tlv2,
+[V2|Tlv3] = Tlv2,
Term2 = 'dec_AttributeValueAssertion'(V2, [16]),
case Tlv3 of
@@ -2807,14 +2807,14 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
'dec_ExtendedRequest'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
%%-------------------------------------------------
%% attribute requestName(1) with type OCTET STRING
%%-------------------------------------------------
-[V1|Tlv2] = Tlv1,
+[V1|Tlv2] = Tlv1,
Term1 = decode_restricted_string(V1,[131072]),
%%-------------------------------------------------
@@ -2936,26 +2936,26 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
'dec_ExtendedResponse'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
%%-------------------------------------------------
%% attribute resultCode(1) with type ENUMERATED
%%-------------------------------------------------
-[V1|Tlv2] = Tlv1,
+[V1|Tlv2] = Tlv1,
Term1 = decode_enumerated(V1,[{success,0},{operationsError,1},{protocolError,2},{timeLimitExceeded,3},{sizeLimitExceeded,4},{compareFalse,5},{compareTrue,6},{authMethodNotSupported,7},{strongAuthRequired,8},{referral,10},{adminLimitExceeded,11},{unavailableCriticalExtension,12},{confidentialityRequired,13},{saslBindInProgress,14},{noSuchAttribute,16},{undefinedAttributeType,17},{inappropriateMatching,18},{constraintViolation,19},{attributeOrValueExists,20},{invalidAttributeSyntax,21},{noSuchObject,32},{aliasProblem,33},{invalidDNSyntax,34},{aliasDereferencingProblem,36},{inappropriateAuthentication,48},{invalidCredentials,49},{insufficientAccessRights,50},{busy,51},{unavailable,52},{unwillingToPerform,53},{loopDetect,54},{namingViolation,64},{objectClassViolation,65},{notAllowedOnNonLeaf,66},{notAllowedOnRDN,67},{entryAlreadyExists,68},{objectClassModsProhibited,69},{affectsMultipleDSAs,71},{other,80}],[10]),
%%-------------------------------------------------
%% attribute matchedDN(2) with type OCTET STRING
%%-------------------------------------------------
-[V2|Tlv3] = Tlv2,
+[V2|Tlv3] = Tlv2,
Term2 = decode_restricted_string(V2,[4]),
%%-------------------------------------------------
%% attribute errorMessage(3) with type OCTET STRING
%%-------------------------------------------------
-[V3|Tlv4] = Tlv3,
+[V3|Tlv4] = Tlv3,
Term3 = decode_restricted_string(V3,[4]),
%%-------------------------------------------------
@@ -3041,7 +3041,7 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
'dec_PasswdModifyRequestValue'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
@@ -3110,7 +3110,7 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
'dec_PasswdModifyResponseValue'(Tlv, TagIn) ->
%%-------------------------------------------------
- %% decode tag and length
+ %% decode tag and length
%%-------------------------------------------------
Tlv1 = match_tags(Tlv, TagIn),
View
5 src/ejabberd_admin.erl
@@ -172,7 +172,6 @@ commands() ->
desc = "Delete offline messages older than DAYS",
module = ?MODULE, function = delete_old_messages,
args = [{days, integer}], result = {res, rescode}},
-
#ejabberd_commands{name = rename_default_nodeplugin, tags = [mnesia],
desc = "Update PubSub table from old ejabberd trunk SVN to 2.1.0",
module = mod_pubsub, function = rename_default_nodeplugin,
@@ -452,7 +451,7 @@ restore_mnesia(Path) ->
%% Mnesia database restore
%% This function is called from ejabberd_ctl, ejabberd_web_admin and
-%% mod_configure/adhoc
+%% mod_configure/adhoc
restore(Path) ->
mnesia:restore(Path, [{keep_tables,keep_tables()},
{default_op, skip_tables}]).
@@ -467,7 +466,7 @@ keep_tables() ->
%% Returns the list of modules tables in use, according to the list of actually
%% loaded modules
-keep_modules_tables() ->
+keep_modules_tables() ->
lists:map(fun(Module) -> module_tables(Module) end,
gen_mod:loaded_modules(?MYNAME)).
View
4 src/ejabberd_auth.erl
@@ -73,7 +73,7 @@
-callback get_vh_registered_users_number(binary()) -> number().
-callback get_vh_registered_users_number(binary(), opts()) -> number().
-callback get_password(binary(), binary()) -> false | binary().
--callback get_password_s(binary(), binary()) -> binary().
+-callback get_password_s(binary(), binary()) -> binary().
start() ->
%% This is only executed by ejabberd_c2s for non-SASL auth client
@@ -117,7 +117,7 @@ check_password(User, Server, Password) ->
%% true | false
-spec check_password(binary(), binary(), binary(), binary(),
fun((binary()) -> binary())) -> boolean().
-
+
check_password(User, Server, Password, Digest,
DigestGen) ->
case check_password_with_authmodule(User, Server,
View
4 src/ejabberd_c2s.erl
@@ -1576,7 +1576,7 @@ print_state(State = #state{pres_t = T, pres_f = F, pres_a = A, pres_i = I}) ->
pres_a = {pres_a, ?SETS:size(A)},
pres_i = {pres_i, ?SETS:size(I)}
}.
-
+
%%----------------------------------------------------------------------
%% Func: terminate/3
%% Purpose: Shutdown the fsm
@@ -1653,7 +1653,7 @@ change_shaper(StateData, JID) ->
send_text(StateData, Text) when StateData#state.xml_socket ->
?DEBUG("Send Text on stream = ~p", [Text]),
- (StateData#state.sockmod):send_xml(StateData#state.socket,
+ (StateData#state.sockmod):send_xml(StateData#state.socket,
{xmlstreamraw, Text});
send_text(StateData, Text) ->
?DEBUG("Send XML on stream = ~p", [Text]),
View
8 src/ejabberd_commands.erl
@@ -297,7 +297,7 @@ execute_command(Name, Arguments) ->
execute_command([], noauth, Name, Arguments).
%% @spec (AccessCommands, Auth, Name::atom(), Arguments) -> ResultTerm | {error, Error}
-%% where
+%% where
%% AccessCommands = [{Access, CommandNames, Arguments}]
%% Auth = {User::string(), Server::string(), Password::string()} | noauth
%% Method = atom()
@@ -356,7 +356,7 @@ get_tags_commands() ->
%% -----------------------------
%% @spec (AccessCommands, Auth, Method, Command, Arguments) -> ok
-%% where
+%% where
%% AccessCommands = [ {Access, CommandNames, Arguments} ]
%% Auth = {User::string(), Server::string(), Password::string()} | noauth
%% Method = atom()
@@ -426,8 +426,8 @@ check_access_arguments(Command, ArgumentRestrictions, Arguments) ->
tag_arguments(ArgsDefs, Args) ->
lists:zipwith(
- fun({ArgName, _ArgType}, ArgValue) ->
+ fun({ArgName, _ArgType}, ArgValue) ->
{ArgName, ArgValue}
- end,
+ end,
ArgsDefs,
Args).
View
6 src/ejabberd_config.erl
@@ -310,11 +310,11 @@ split_terms_macros(Terms) ->
lists:foldl(
fun(Term, {TOs, Ms}) ->
case Term of
- {define_macro, Key, Value} ->
+ {define_macro, Key, Value} ->
case is_atom(Key) and is_all_uppercase(Key) of
- true ->
+ true ->
{TOs, Ms++[{Key, Value}]};
- false ->
+ false ->
exit({macro_not_properly_defined, Term})
end;
Term ->
View
12 src/ejabberd_http_poll.erl
@@ -200,7 +200,7 @@ get_human_html_xmlel() ->
%% Returns: {ok, StateName, StateData} |
%% {ok, StateName, StateData, Timeout} |
%% ignore |
-%% {stop, StopReason}
+%% {stop, StopReason}
%%----------------------------------------------------------------------
init([ID, Key, IP]) ->
?INFO_MSG("started: ~p", [{ID, Key, IP}]),
@@ -221,7 +221,7 @@ init([ID, Key, IP]) ->
%% Func: StateName/2
%% Returns: {next_state, NextStateName, NextStateData} |
%% {next_state, NextStateName, NextStateData, Timeout} |
-%% {stop, Reason, NewStateData}
+%% {stop, Reason, NewStateData}
%% {stop, Reason, NewStateData}
%%----------------------------------------------------------------------
@@ -232,7 +232,7 @@ init([ID, Key, IP]) ->
%% {reply, Reply, NextStateName, NextStateData} |
%% {reply, Reply, NextStateName, NextStateData, Timeout} |
%% {stop, Reason, NewStateData} |
-%% {stop, Reason, Reply, NewStateData}
+%% {stop, Reason, Reply, NewStateData}
%% {stop, Reason, Reply, NewStateData}
%%----------------------------------------------------------------------
%state_name(Event, From, StateData) ->
@@ -243,7 +243,7 @@ init([ID, Key, IP]) ->
%% Func: handle_event/3
%% Returns: {next_state, NextStateName, NextStateData} |
%% {next_state, NextStateName, NextStateData, Timeout} |
-%% {stop, Reason, NewStateData}
+%% {stop, Reason, NewStateData}
%%----------------------------------------------------------------------
handle_event({activate, From}, StateName, StateData) ->
case StateData#state.input of
@@ -268,7 +268,7 @@ handle_event(_Event, StateName, StateData) ->
%% {reply, Reply, NextStateName, NextStateData} |
%% {reply, Reply, NextStateName, NextStateData, Timeout} |
%% {stop, Reason, NewStateData} |
-%% {stop, Reason, Reply, NewStateData}
+%% {stop, Reason, Reply, NewStateData}
%%----------------------------------------------------------------------
handle_sync_event({send, Packet}, _From, StateName,
StateData) ->
@@ -332,7 +332,7 @@ code_change(_OldVsn, StateName, StateData, _Extra) ->
%% Func: handle_info/3
%% Returns: {next_state, NextStateName, NextStateData} |
%% {next_state, NextStateName, NextStateData, Timeout} |
-%% {stop, Reason, NewStateData}
+%% {stop, Reason, NewStateData}
%%----------------------------------------------------------------------
handle_info({timeout, Timer, _}, _StateName,
#state{timer = Timer} = StateData) ->
View
4 src/ejabberd_odbc.erl
@@ -445,10 +445,10 @@ sql_query_internal(Query) ->
pgsql ->
pgsql_to_odbc(pgsql:squery(State#state.db_ref, Query));
mysql ->
- ?DEBUG("MySQL, Send query~n~p~n", [Query]),
+ ?DEBUG("MySQL, Send query~n~p~n", [Query]),
%%squery to be able to specify result_type = binary
%%[Query] because mysql_conn expect query to be a list (elements can be binaries, or iolist)
- %% but doesn't accept just a binary
+ %% but doesn't accept just a binary
R = mysql_to_odbc(mysql_conn:squery(State#state.db_ref,
[Query], self(),
[{timeout, (?TRANSACTION_TIMEOUT) - 1000},
View
6 src/ejabberd_sm.erl
@@ -426,8 +426,8 @@ set_session(SID, User, Server, Resource, Priority, Info) ->
end,
mnesia:sync_dirty(F).
-%% Recalculates alive sessions when Node goes down
-%% and updates session and session_counter tables
+%% Recalculates alive sessions when Node goes down
+%% and updates session and session_counter tables
recount_session_table(Node) ->
F = fun() ->
Es = mnesia:select(
@@ -447,7 +447,7 @@ recount_session_table(Node) ->
[{'==', {element, 2, '$1'}, LServer}],
['$1']}]),
mnesia:write(
- #session_counter{vhost = LServer,
+ #session_counter{vhost = LServer,
count = length(Hs)})
end, ?MYHOSTS)
end,
View
16 src/ejabberd_update.erl
@@ -160,33 +160,33 @@ build_script(Dir, UpdatedBeams) ->
{Script, LowLevelScript, Check1}.
%% Copied from Erlang/OTP file: lib/sasl/src/systools.hrl
--record(application,
+-record(application,
{name, %% Name of the application, atom().
type = permanent, %% Application start type, atom().
vsn = "", %% Version of the application, string().
id = "", %% Id of the application, string().
description = "", %% Description of application, string().
- modules = [], %% [Module | {Module,Vsn}] of modules
- %% incorporated in the application,
+ modules = [], %% [Module | {Module,Vsn}] of modules
+ %% incorporated in the application,
%% Module = atom(), Vsn = string().
uses = [], %% [Application] list of applications required
%% by the application, Application = atom().
includes = [], %% [Application] list of applications included
%% by the application, Application = atom().
- regs = [], %% [RegNames] a list of registered process
+ regs = [], %% [RegNames] a list of registered process
%% names used by the application, RegNames =
%% atom().
- env = [], %% [{Key,Value}] environment variable of
+ env = [], %% [{Key,Value}] environment variable of
%% application, Key = Value = term().
- maxT = infinity, %% Max time an application may exist,
+ maxT = infinity, %% Max time an application may exist,
%% integer() | infinity.
maxP = infinity, %% Max number of processes in an application,
%% integer() | infinity.
- mod = [], %% [] | {Mod, StartArgs}, Mod= atom(),
+ mod = [], %% [] | {Mod, StartArgs}, Mod= atom(),
%% StartArgs = list().
start_phases = [], %% [] | {Phase, PhaseArgs}, Phase = atom(),
%% PhaseArgs = list().
- dir = "" %% The directory where the .app file was
+ dir = "" %% The directory where the .app file was
%% found (internal use).
}).
View
2  src/ejabberd_web.erl
@@ -1,7 +1,7 @@
%%%----------------------------------------------------------------------
%%% File : ejabberd_web.erl
%%% Author : Alexey Shchepin <alexey@process-one.net>
-%%% Purpose :
+%%% Purpose :
%%% Purpose :
%%% Created : 28 Feb 2004 by Alexey Shchepin <alexey@process-one.net>
%%%
View
38 src/eldap.erl
@@ -6,7 +6,7 @@
%%% draft-ietf-asid-ldap-c-api-00.txt
%%%
%%% Copyright (C) 2000 Torbjorn Tornkvist, tnt@home.se
-%%%
+%%%
%%%
%%% This program is free software; you can redistribute it and/or modify
%%% it under the terms of the GNU General Public License as published by
@@ -182,7 +182,7 @@ close(Handle) ->
%%% to succeed. The parent of the entry MUST exist.
%%% Example:
%%%
-%%% add(Handle,
+%%% add(Handle,
%%% "cn=Bill Valentine, ou=people, o=Bluetail AB, dc=bluetail, dc=com",
%%% [{"objectclass", ["person"]},
%%% {"cn", ["Bill Valentine"]},
@@ -206,11 +206,11 @@ add_attrs(Attrs) ->
end.
%%% --------------------------------------------------------------------
-%%% Delete an entry. The entry consists of the DN of
+%%% Delete an entry. The entry consists of the DN of
%%% the entry to be deleted.
%%% Example:
%%%
-%%% delete(Handle,
+%%% delete(Handle,
%%% "cn=Bill Valentine, ou=people, o=Bluetail AB, dc=bluetail, dc=com"
%%% )
%%% --------------------------------------------------------------------
@@ -224,10 +224,10 @@ delete(Handle, Entry) ->
%%% operations can be performed as one atomic operation.
%%% Example:
%%%
-%%% modify(Handle,
+%%% modify(Handle,
%%% "cn=Torbjorn Tornkvist, ou=people, o=Bluetail AB, dc=bluetail, dc=com",
%%% [replace("telephoneNumber", ["555 555 00"]),
-%%% add("description", ["LDAP hacker"])]
+%%% add("description", ["LDAP hacker"])]
%%% )
%%% --------------------------------------------------------------------
-spec modify(handle(), any(), [add | delete | replace]) -> any().
@@ -238,7 +238,7 @@ modify(Handle, Object, Mods) ->
?CALL_TIMEOUT).
%%%
-%%% Modification operations.
+%%% Modification operations.
%%% Example:
%%% replace("telephoneNumber", ["555 555 00"])
%%%
@@ -253,7 +253,7 @@ mod_delete(Type, Values) ->
%%% operations can be performed as one atomic operation.
%%% Example:
%%%
-%%% modify_dn(Handle,
+%%% modify_dn(Handle,
%%% "cn=Bill Valentine, ou=people, o=Bluetail AB, dc=bluetail, dc=com",
%%% "cn=Ben Emerson",
%%% true,
@@ -290,12 +290,12 @@ modify_passwd(Handle, DN, Passwd) ->
%%% Bind.
%%% Example:
%%%
-%%% bind(Handle,
+%%% bind(Handle,
%%% "cn=Bill Valentine, ou=people, o=Bluetail AB, dc=bluetail, dc=com",
%%% "secret")
%%% --------------------------------------------------------------------
-spec bind(handle(), binary(), binary()) -> any().
-
+
bind(Handle, RootDN, Passwd) ->
Handle1 = get_handle(Handle),
gen_fsm:sync_send_event(Handle1, {bind, RootDN, Passwd},
@@ -309,7 +309,7 @@ optional([]) -> asn1_NOVALUE;
optional(Value) -> Value.
%%% --------------------------------------------------------------------
-%%% Synchronous search of the Directory returning a
+%%% Synchronous search of the Directory returning a
%%% requested set of attributes.
%%%
%%% Example:
@@ -563,9 +563,9 @@ get_handle(Name) when is_binary(Name) ->
%% Returns: {ok, StateName, StateData} |
%% {ok, StateName, StateData, Timeout} |
%% ignore |
-%% {stop, StopReason}
+%% {stop, StopReason}
%% I use the trick of setting a timeout of 0 to pass control into the
-%% process.
+%% process.
%%----------------------------------------------------------------------
init([Hosts, Port, Rootdn, Passwd, Opts]) ->
Encrypt = case gen_mod:get_opt(encrypt, Opts,
@@ -637,7 +637,7 @@ init([Hosts, Port, Rootdn, Passwd, Opts]) ->
%% Called when gen_fsm:send_event/2,3 is invoked (async)
%% Returns: {next_state, NextStateName, NextStateData} |
%% {next_state, NextStateName, NextStateData, Timeout} |
-%% {stop, Reason, NewStateData}
+%% {stop, Reason, NewStateData}
%%----------------------------------------------------------------------
connecting(timeout, S) ->
{ok, NextState, NewS} = connect_bind(S),
@@ -651,7 +651,7 @@ connecting(timeout, S) ->
%% {reply, Reply, NextStateName, NextStateData} |
%% {reply, Reply, NextStateName, NextStateData, Timeout} |
%% {stop, Reason, NewStateData} |
-%% {stop, Reason, Reply, NewStateData}
+%% {stop, Reason, Reply, NewStateData}
%%----------------------------------------------------------------------
connecting(Event, From, S) ->
Q = queue:in({Event, From}, S#eldap.req_q),
@@ -673,7 +673,7 @@ active(Event, From, S) ->
%% Called when gen_fsm:send_all_state_event/2 is invoked.
%% Returns: {next_state, NextStateName, NextStateData} |
%% {next_state, NextStateName, NextStateData, Timeout} |
-%% {stop, Reason, NewStateData}
+%% {stop, Reason, NewStateData}
%%----------------------------------------------------------------------
handle_event(close, _StateName, S) ->
catch (S#eldap.sockmod):close(S#eldap.fd),
@@ -689,7 +689,7 @@ handle_event(_Event, StateName, S) ->
%% {reply, Reply, NextStateName, NextStateData} |
%% {reply, Reply, NextStateName, NextStateData, Timeout} |
%% {stop, Reason, NewStateData} |
-%% {stop, Reason, Reply, NewStateData}
+%% {stop, Reason, Reply, NewStateData}
%%----------------------------------------------------------------------
handle_sync_event(_Event, _From, StateName, S) ->
{reply, {StateName, S}, StateName, S}.
@@ -698,7 +698,7 @@ handle_sync_event(_Event, _From, StateName, S) ->
%% Func: handle_info/3
%% Returns: {next_state, NextStateName, NextStateData} |
%% {next_state, NextStateName, NextStateData, Timeout} |
-%% {stop, Reason, NewStateData}
+%% {stop, Reason, NewStateData}
%% {stop, Reason, NewStateData}
%%----------------------------------------------------------------------
@@ -880,7 +880,7 @@ gen_req({bind, RootDN, Passwd}) ->
%% recvd_packet
%% Deals with incoming packets in the active state
%% Will return one of:
-%% {ok, NewS} - Don't reply to client yet as this is part of a search
+%% {ok, NewS} - Don't reply to client yet as this is part of a search
%% result and we haven't got all the answers yet.
%% {reply, Result, From, NewS} - Reply with result to client From
%% {error, Reason}
View
48 src/eldap_utils.erl
@@ -162,13 +162,13 @@ get_state(Server, Module) ->
%% we look from alias domain (%d) and make the substitution
%% with the actual host domain
%% This help when you need to configure many virtual domains.
--spec uids_domain_subst(binary(), [{binary(), binary()}]) ->
+-spec uids_domain_subst(binary(), [{binary(), binary()}]) ->
[{binary(), binary()}].
uids_domain_subst(Host, UIDs) ->
lists:map(fun({U,V}) ->
{U, eldap_filter:do_sub(V,[{<<"%d">>, Host}])};
- (A) -> A
+ (A) -> A
end,
UIDs).
@@ -247,44 +247,44 @@ get_config(Host, Opts) ->
base = Base,
deref_aliases = DerefAliases}.
-%%----------------------------------------
+%%----------------------------------------
%% Borrowed from asn1rt_ber_bin_v2.erl
%%----------------------------------------
%%% The tag-number for universal types
--define(N_BOOLEAN, 1).
--define(N_INTEGER, 2).
+-define(N_BOOLEAN, 1).
+-define(N_INTEGER, 2).
-define(N_BIT_STRING, 3).
-define(N_OCTET_STRING, 4).
--define(N_NULL, 5).
--define(N_OBJECT_IDENTIFIER, 6).
--define(N_OBJECT_DESCRIPTOR, 7).
--define(N_EXTERNAL, 8).
--define(N_REAL, 9).
--define(N_ENUMERATED, 10).
--define(N_EMBEDDED_PDV, 11).
--define(N_SEQUENCE, 16).
--define(N_SET, 17).
+-define(N_NULL, 5).
+-define(N_OBJECT_IDENTIFIER, 6).
+-define(N_OBJECT_DESCRIPTOR, 7).
+-define(N_EXTERNAL, 8).
+-define(N_REAL, 9).
+-define(N_ENUMERATED, 10).
+-define(N_EMBEDDED_PDV, 11).
+-define(N_SEQUENCE, 16).
+-define(N_SET, 17).
-define(N_NumericString, 18).
-define(N_PrintableString, 19).
-define(N_TeletexString, 20).
-define(N_VideotexString, 21).
-define(N_IA5String, 22).
--define(N_UTCTime, 23).
--define(N_GeneralizedTime, 24).
+-define(N_UTCTime, 23).
+-define(N_GeneralizedTime, 24).
-define(N_GraphicString, 25).
-define(N_VisibleString, 26).
-define(N_GeneralString, 27).
-define(N_UniversalString, 28).
-define(N_BMPString, 30).
-decode_octet_string(Buffer, Range, Tags) ->
+decode_octet_string(Buffer, Range, Tags) ->
% NewTags = new_tags(HasTag,#tag{class=?UNIVERSAL,number=?N_OCTET_STRING}),
decode_restricted_string(Buffer, Range, Tags).
decode_restricted_string(Tlv, Range, TagsIn) ->
Val = match_tags(Tlv, TagsIn),
- Val2 =
+ Val2 =
case Val of
PartList = [_H|_T] -> % constructed val
collect_parts(PartList);
@@ -308,12 +308,12 @@ check_and_convert_restricted_string(Val, Range) ->
NewVal;
{{Lb,_Ub},_Ext=[Min|_]} when StrLen >= Lb; StrLen >= Min ->
NewVal;
- {{Lb1,Ub1},{Lb2,Ub2}} when StrLen >= Lb1, StrLen =< Ub1;
+ {{Lb1,Ub1},{Lb2,Ub2}} when StrLen >= Lb1, StrLen =< Ub1;
StrLen =< Ub2, StrLen >= Lb2 ->
NewVal;
StrLen -> % fixed length constraint
NewVal;
- {_,_} ->
+ {_,_} ->
exit({error,{asn1,{length,Range,Val}}});
_Len when is_integer(_Len) ->
exit({error,{asn1,{length,Range,Val}}});
@@ -321,9 +321,9 @@ check_and_convert_restricted_string(Val, Range) ->
NewVal
end.
-%%----------------------------------------
-%% Decode the in buffer to bits
-%%----------------------------------------
+%%----------------------------------------
+%% Decode the in buffer to bits
+%%----------------------------------------
match_tags({T,V},[T]) ->
V;
match_tags({T,V}, [T|Tt]) ->
@@ -349,7 +349,7 @@ collect_parts([{_T,V}|Rest],Acc) ->
collect_parts([],Acc) ->
list_to_binary(lists:reverse(Acc)).
-collect_parts_bit([{?N_BIT_STRING,<<Unused,Bits/binary>>}|Rest],Acc,Uacc) ->
+collect_parts_bit([{?N_BIT_STRING,<<Unused,Bits/binary>>}|Rest],Acc,Uacc) ->
collect_parts_bit(Rest,[Bits|Acc],Unused+Uacc);
collect_parts_bit([],Acc,Uacc) ->
list_to_binary([Uacc|lists:reverse(Acc)]).
View
2  src/gen_mod.erl
@@ -1,7 +1,7 @@
%%%----------------------------------------------------------------------
%%% File : gen_mod.erl
%%% Author : Alexey Shchepin <alexey@process-one.net>
-%%% Purpose :
+%%% Purpose :
%%% Purpose :
%%% Created : 24 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
%%%
View
2  src/jlib.erl
@@ -785,7 +785,7 @@ check_list(List) ->
decode_base64(S) ->
decode_base64_bin(S, <<>>).
-take_without_spaces(Bin, Count) ->
+take_without_spaces(Bin, Count) ->
take_without_spaces(Bin, Count, <<>>).
take_without_spaces(Bin, 0, Acc) ->
View
12 src/mod_announce.erl
@@ -508,10 +508,10 @@ vvaluel(Val) ->
generate_adhoc_form(Lang, Node, ServerHost) ->
LNode = tokenize(Node),
- {OldSubject, OldBody} = if (LNode == ?NS_ADMINL("edit-motd"))
+ {OldSubject, OldBody} = if (LNode == ?NS_ADMINL("edit-motd"))
or (LNode == ?NS_ADMINL("edit-motd-allhosts")) ->
get_stored_motd(ServerHost);
- true ->
+ true ->
{<<>>, <<>>}
end,
#xmlel{
@@ -641,25 +641,25 @@ handle_adhoc_form(From, #jid{lserver = LServer} = To,
{?NS_ADMIN_ANNOUNCE, _} ->
Proc ! {announce_online, From, To, Packet},
adhoc:produce_response(Response);
- {?NS_ADMIN_ANNOUNCE_ALLHOSTS, _} ->
+ {?NS_ADMIN_ANNOUNCE_ALLHOSTS, _} ->
Proc ! {announce_all_hosts_online, From, To, Packet},
adhoc:produce_response(Response);
{?NS_ADMIN_ANNOUNCE_ALL, _} ->
Proc ! {announce_all, From, To, Packet},
adhoc:produce_response(Response);
- {?NS_ADMIN_ANNOUNCE_ALL_ALLHOSTS, _} ->
+ {?NS_ADMIN_ANNOUNCE_ALL_ALLHOSTS, _} ->
Proc ! {announce_all_hosts_all, From, To, Packet},
adhoc:produce_response(Response);
{?NS_ADMIN_SET_MOTD, _} ->
Proc ! {announce_motd, From, To, Packet},
adhoc:produce_response(Response);
- {?NS_ADMIN_SET_MOTD_ALLHOSTS, _} ->
+ {?NS_ADMIN_SET_MOTD_ALLHOSTS, _} ->
Proc ! {announce_all_hosts_motd, From, To, Packet},
adhoc:produce_response(Response);
{?NS_ADMIN_EDIT_MOTD, _} ->
Proc ! {announce_motd_update, From, To, Packet},
adhoc:produce_response(Response);
- {?NS_ADMIN_EDIT_MOTD_ALLHOSTS, _} ->
+ {?NS_ADMIN_EDIT_MOTD_ALLHOSTS, _} ->
Proc ! {announce_all_hosts_motd_update, From, To, Packet},
adhoc:produce_response(Response);
_ ->