diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/ejabberd_oauth.hrl | 2 | ||||
| -rw-r--r-- | include/ejabberd_router.hrl | 8 | ||||
| -rw-r--r-- | include/ejabberd_sm.hrl | 3 | ||||
| -rw-r--r-- | include/eldap.hrl | 2 | ||||
| -rw-r--r-- | include/jlib.hrl | 18 | ||||
| -rw-r--r-- | include/mod_muc_room.hrl | 18 | ||||
| -rw-r--r-- | include/mod_offline.hrl | 6 |
7 files changed, 29 insertions, 28 deletions
diff --git a/include/ejabberd_oauth.hrl b/include/ejabberd_oauth.hrl index 2e36d069b..ea3ac4307 100644 --- a/include/ejabberd_oauth.hrl +++ b/include/ejabberd_oauth.hrl @@ -22,5 +22,5 @@ token = <<"">> :: binary() | '_', us = {<<"">>, <<"">>} :: {binary(), binary()} | '_', scope = [] :: [binary()] | '_', - expire :: integer() | '$1' + expire :: integer() | '$1' | '_' }). diff --git a/include/ejabberd_router.hrl b/include/ejabberd_router.hrl index 8de23c4c7..f22bd723b 100644 --- a/include/ejabberd_router.hrl +++ b/include/ejabberd_router.hrl @@ -1,6 +1,6 @@ --type local_hint() :: undefined | integer() | {apply, atom(), atom()}. +-type local_hint() :: integer() | {apply, atom(), atom()}. --record(route, {domain :: binary(), - server_host :: binary(), +-record(route, {domain :: binary() | '_', + server_host :: binary() | '_', pid :: undefined | pid(), - local_hint :: local_hint()}). + local_hint :: local_hint() | undefined | '_'}). diff --git a/include/ejabberd_sm.hrl b/include/ejabberd_sm.hrl index 0591dd09e..71cfc9ee9 100644 --- a/include/ejabberd_sm.hrl +++ b/include/ejabberd_sm.hrl @@ -27,7 +27,8 @@ -type ip() :: {inet:ip_address(), inet:port_number()} | undefined. -type info() :: [{conn, atom()} | {ip, ip()} | {node, atom()} | {oor, boolean()} | {auth_module, atom()} - | {num_stanzas_in, non_neg_integer()}]. + | {num_stanzas_in, non_neg_integer()} + | offline]. -type prio() :: undefined | integer(). -endif. diff --git a/include/eldap.hrl b/include/eldap.hrl index 5ec1f9c88..d4bb0fac1 100644 --- a/include/eldap.hrl +++ b/include/eldap.hrl @@ -27,7 +27,7 @@ -record(eldap_search, {scope = wholeSubtree :: scope(), base = <<"">> :: binary(), - filter :: eldap:filter(), + filter :: eldap:filter() | undefined, limit = 0 :: non_neg_integer(), attributes = [] :: [binary()], types_only = false :: boolean(), diff --git a/include/jlib.hrl b/include/jlib.hrl index 6f0972f81..cd5fedbfd 100644 --- a/include/jlib.hrl +++ b/include/jlib.hrl @@ -471,15 +471,15 @@ -type(iq() :: iq_request() | iq_reply()). --record(rsm_in, {max :: integer() | error, - direction :: before | aft, - id :: binary(), - index :: integer() | error}). - --record(rsm_out, {count :: integer(), - index :: integer(), - first :: binary(), - last :: binary()}). +-record(rsm_in, {max :: integer() | error | undefined, + direction :: before | aft | undefined, + id :: binary() | undefined, + index :: integer() | error | undefined}). + +-record(rsm_out, {count :: integer() | undefined, + index :: integer() | undefined, + first :: binary() | undefined, + last :: binary() | undefined}). -type(rsm_in() :: #rsm_in{}). diff --git a/include/mod_muc_room.hrl b/include/mod_muc_room.hrl index 010dc6e99..c0d8f50bd 100644 --- a/include/mod_muc_room.hrl +++ b/include/mod_muc_room.hrl @@ -28,9 +28,9 @@ -record(lqueue, { - queue :: ?TQUEUE, - len :: integer(), - max :: integer() + queue = queue:new() :: ?TQUEUE, + len = 0 :: integer(), + max = 0 :: integer() }). -type lqueue() :: #lqueue{}. @@ -80,7 +80,7 @@ role :: role(), %%is_subscriber = false :: boolean(), %%subscriptions = [] :: [binary()], - last_presence :: xmlel() + last_presence :: presence() | undefined }). -record(subscriber, {jid :: jid(), @@ -91,10 +91,10 @@ { message_time = 0 :: integer(), presence_time = 0 :: integer(), - message_shaper :: shaper:shaper(), - presence_shaper :: shaper:shaper(), - message :: xmlel(), - presence :: {binary(), xmlel()} + message_shaper = none :: shaper:shaper(), + presence_shaper = none :: shaper:shaper(), + message :: message() | undefined, + presence :: {binary(), presence()} | undefined }). -record(state, @@ -112,7 +112,7 @@ robots = (?DICT):new() :: ?TDICT, nicks = (?DICT):new() :: ?TDICT, affiliations = (?DICT):new() :: ?TDICT, - history :: lqueue(), + history = #lqueue{} :: lqueue(), subject = <<"">> :: binary(), subject_author = <<"">> :: binary(), just_created = false :: boolean(), diff --git a/include/mod_offline.hrl b/include/mod_offline.hrl index 682e361f2..e4ae76708 100644 --- a/include/mod_offline.hrl +++ b/include/mod_offline.hrl @@ -20,11 +20,11 @@ -record(offline_msg, {us = {<<"">>, <<"">>} :: {binary(), binary()}, - timestamp = p1_time_compat:timestamp() :: erlang:timestamp() | '_', - expire = p1_time_compat:timestamp() :: erlang:timestamp() | never | '_', + timestamp :: erlang:timestamp() | '_' | undefined, + expire :: erlang:timestamp() | never | undefined | '_', from = #jid{} :: jid() | '_', to = #jid{} :: jid() | '_', - packet = #xmlel{} :: xmlel() | '_'}). + packet = #xmlel{} :: xmlel() | message() | '_'}). -record(state, {host = <<"">> :: binary(), |