slighly renaming
authorVolker Birk <vb@pep-project.org>
Fri, 01 May 2015 00:23:03 +0200
changeset 2323d44d9bb18e5
parent 231 d862ff6c48c7
child 233 26383354c776
slighly renaming
src/message_api.c
src/message_api.h
     1.1 --- a/src/message_api.c	Thu Apr 30 19:03:18 2015 +0200
     1.2 +++ b/src/message_api.c	Fri May 01 00:23:03 2015 +0200
     1.3 @@ -776,7 +776,7 @@
     1.4  DYNAMIC_API PEP_STATUS get_message_color(
     1.5          PEP_SESSION session,
     1.6          message *msg,
     1.7 -        pEp_color *color
     1.8 +        PEP_color *color
     1.9      )
    1.10  {
    1.11      PEP_STATUS status = PEP_STATUS_OK;
    1.12 @@ -791,7 +791,7 @@
    1.13      if (!(session && msg && color))
    1.14          return PEP_ILLEGAL_VALUE;
    1.15  
    1.16 -    *color = pEp_undefined;
    1.17 +    *color = PEP_undefined;
    1.18  
    1.19      assert(msg->from);
    1.20      if (msg->from == NULL)
    1.21 @@ -841,30 +841,30 @@
    1.22      }
    1.23  
    1.24      if (comm_type_determined == false)
    1.25 -        *color = pEp_undefined;
    1.26 +        *color = PEP_undefined;
    1.27  
    1.28      else if (max_comm_type == PEP_ct_compromized)
    1.29 -        *color = pEp_under_attack;
    1.30 +        *color = PEP_under_attack;
    1.31  
    1.32      else if (max_comm_type >= PEP_ct_confirmed_enc_anon)
    1.33 -        *color = pEp_trusted_and_anonymized;
    1.34 +        *color = PEP_trusted_and_anonymized;
    1.35  
    1.36      else if (max_comm_type >= PEP_ct_strong_encryption)
    1.37 -        *color = pEp_trusted;
    1.38 +        *color = PEP_trusted;
    1.39  
    1.40      else if (max_comm_type >= PEP_ct_strong_but_unconfirmed &&
    1.41              max_comm_type < PEP_ct_confirmed)
    1.42 -        *color = pEp_reliable;
    1.43 +        *color = PEP_reliable;
    1.44      
    1.45      else if (max_comm_type == PEP_ct_no_encryption ||
    1.46              max_comm_type == PEP_ct_no_encrypted_channel)
    1.47 -        *color = pEp_unencrypted;
    1.48 +        *color = PEP_unencrypted;
    1.49  
    1.50      else if (max_comm_type == PEP_ct_unknown)
    1.51 -        *color = pEp_undefined;
    1.52 +        *color = PEP_undefined;
    1.53  
    1.54      else
    1.55 -        *color = pEp_unreliable;
    1.56 +        *color = PEP_unreliable;
    1.57  
    1.58      return PEP_STATUS_OK;
    1.59  }
     2.1 --- a/src/message_api.h	Thu Apr 30 19:03:18 2015 +0200
     2.2 +++ b/src/message_api.h	Fri May 01 00:23:03 2015 +0200
     2.3 @@ -62,21 +62,21 @@
     2.4      );
     2.5  
     2.6  
     2.7 -typedef enum _pEp_color {
     2.8 -    pEp_undefined = 0,
     2.9 -    pEp_unencrypted,
    2.10 -    pEp_unreliable,
    2.11 -    pEp_reliable,
    2.12 -    pEp_yellow = pEp_reliable,
    2.13 -    pEp_trusted,
    2.14 -    pEp_green = pEp_trusted,
    2.15 -    pEp_trusted_and_anonymized,
    2.16 -    pEp_fully_anonymous,   
    2.17 +typedef enum _PEP_color {
    2.18 +    PEP_undefined = 0,
    2.19 +    PEP_unencrypted,
    2.20 +    PEP_unreliable,
    2.21 +    PEP_reliable,
    2.22 +    PEP_yellow = PEP_reliable,
    2.23 +    PEP_trusted,
    2.24 +    PEP_green = PEP_trusted,
    2.25 +    PEP_trusted_and_anonymized,
    2.26 +    PEP_fully_anonymous,   
    2.27  
    2.28 -    pEp_under_attack = -1,
    2.29 -    pEp_red = pEp_under_attack,
    2.30 -    pEp_b0rken = -2
    2.31 -} pEp_color;
    2.32 +    PEP_under_attack = -1,
    2.33 +    PEP_red = PEP_under_attack,
    2.34 +    PEP_b0rken = -2
    2.35 +} PEP_color;
    2.36  
    2.37  // get_message_color() - get color for a message
    2.38  //
    2.39 @@ -94,7 +94,7 @@
    2.40  DYNAMIC_API PEP_STATUS get_message_color(
    2.41          PEP_SESSION session,
    2.42          message *msg,
    2.43 -        pEp_color *color
    2.44 +        PEP_color *color
    2.45      );
    2.46  
    2.47  #ifdef __cplusplus