int casts and bad includes sync
authorKrista 'DarthMama' Bennett <krista@pep.foundation>
Thu, 08 Aug 2019 11:08:15 +0200
branchsync
changeset 3967e4365dde0495
parent 3965 9a59d1fa3d09
child 3968 7bef1333235a
child 3969 e878a24997f2
int casts and bad includes
src/key_reset.c
src/key_reset.h
src/keymanagement.c
src/pEpEngine.h
     1.1 --- a/src/key_reset.c	Thu Aug 08 07:23:44 2019 +0200
     1.2 +++ b/src/key_reset.c	Thu Aug 08 11:08:15 2019 +0200
     1.3 @@ -4,6 +4,8 @@
     1.4  #include "pEp_internal.h"
     1.5  #include "dynamic_api.h"
     1.6  #include "message_api.h"
     1.7 +#include "key_reset.h"
     1.8 +
     1.9  
    1.10  #include <string.h>
    1.11  #include <stdlib.h>
     2.1 --- a/src/key_reset.h	Thu Aug 08 07:23:44 2019 +0200
     2.2 +++ b/src/key_reset.h	Thu Aug 08 11:08:15 2019 +0200
     2.3 @@ -3,8 +3,6 @@
     2.4  
     2.5  #pragma once
     2.6  
     2.7 -#include "key_reset.h"
     2.8 -
     2.9  #include "pEpEngine.h"
    2.10  #include "keymanagement.h"
    2.11  #include "message.h"
     3.1 --- a/src/keymanagement.c	Thu Aug 08 07:23:44 2019 +0200
     3.2 +++ b/src/keymanagement.c	Thu Aug 08 11:08:15 2019 +0200
     3.3 @@ -1228,8 +1228,8 @@
     3.4          identity->comm_type = PEP_ct_unknown;
     3.5      }
     3.6      
     3.7 -    int major_ver = 0;
     3.8 -    int minor_ver = 0;
     3.9 +    unsigned int major_ver = 0;
    3.10 +    unsigned int minor_ver = 0;
    3.11      pEp_version_major_minor(PEP_VERSION, &major_ver, &minor_ver);
    3.12      identity->major_ver = major_ver;
    3.13      identity->minor_ver = minor_ver;
     4.1 --- a/src/pEpEngine.h	Thu Aug 08 07:23:44 2019 +0200
     4.2 +++ b/src/pEpEngine.h	Thu Aug 08 11:08:15 2019 +0200
     4.3 @@ -598,8 +598,8 @@
     4.4      char lang[3];               // language of conversation
     4.5                                  // ISO 639-1 ALPHA-2, last byte is 0
     4.6      bool me;                    // if this is the local user herself/himself
     4.7 -    int major_ver;              // highest version of pEp message received, if any
     4.8 -    int minor_ver;              // highest version of pEp message received, if any
     4.9 +    unsigned int major_ver;              // highest version of pEp message received, if any
    4.10 +    unsigned int minor_ver;              // highest version of pEp message received, if any
    4.11      identity_flags_t flags;     // identity_flag1 | identity_flag2 | ...
    4.12  } pEp_identity;
    4.13