Merge with sync sequoia_windows
authorThomas
Mon, 29 Jul 2019 07:05:03 +0200
branchsequoia_windows
changeset 39378889abf6d2da
parent 3934 88d7900fa705
parent 3936 a4837da81310
child 3946 407b8c05e11a
Merge with sync
     1.1 --- a/build-mac/pEpEngine.xcodeproj/project.pbxproj	Thu Jul 18 14:24:09 2019 +0200
     1.2 +++ b/build-mac/pEpEngine.xcodeproj/project.pbxproj	Mon Jul 29 07:05:03 2019 +0200
     1.3 @@ -1193,7 +1193,10 @@
     1.4  				ENABLE_STRICT_OBJC_MSGSEND = YES;
     1.5  				GCC_C_LANGUAGE_STANDARD = gnu99;
     1.6  				GCC_NO_COMMON_BLOCKS = YES;
     1.7 -				GCC_PREPROCESSOR_DEFINITIONS = "USE_SEQUOIA=1";
     1.8 +				GCC_PREPROCESSOR_DEFINITIONS = (
     1.9 +					"USE_SEQUOIA=1",
    1.10 +					NDEBUG,
    1.11 +				);
    1.12  				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
    1.13  				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
    1.14  				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
     2.1 --- a/sync/gen_message_func.ysl2	Thu Jul 18 14:24:09 2019 +0200
     2.2 +++ b/sync/gen_message_func.ysl2	Mon Jul 29 07:05:03 2019 +0200
     2.3 @@ -297,6 +297,20 @@
     2.4                   = session->«$state».«@name»;
     2.5  
     2.6          ||
     2.7 +        when "@type='Identity'"
     2.8 +        ||
     2.9 +        {
    2.10 +            pEp_identity *ident = Identity_to_Struct(&session->«$state».«@name», NULL);
    2.11 +            if (!ident)
    2.12 +                return PEP_OUT_OF_MEMORY;
    2.13 +            Identity_t *_ident = Identity_from_Struct(ident,
    2.14 +                    &msg->choice.«yml:lcase(../../@name)».choice.«$message_name».«@name»);
    2.15 +            free_identity(ident);
    2.16 +            if (!_ident)
    2.17 +                return PEP_OUT_OF_MEMORY;
    2.18 +        }
    2.19 +
    2.20 +        ||
    2.21          when "@type='IdentityList'"
    2.22          ||
    2.23          {
    2.24 @@ -362,6 +376,21 @@
    2.25                  .choice.«$message_name».«@name»;
    2.26  
    2.27          ||
    2.28 +        when "@type='Identity'"
    2.29 +        ||
    2.30 +        {
    2.31 +            pEp_identity *ident = Identity_to_Struct(
    2.32 +                    &msg->choice.«yml:lcase(../../@name)».choice.«$message_name».«@name», NULL);
    2.33 +            if (!ident)
    2.34 +                return PEP_OUT_OF_MEMORY;
    2.35 +            Identity_t *_ident = Identity_from_Struct(ident,
    2.36 +                    &session->«yml:lcase(../../../@name)»_state.«yml:lcase(../../@name)».«@name»);
    2.37 +            free_identity(ident);
    2.38 +            if (!_ident)
    2.39 +                return PEP_OUT_OF_MEMORY;
    2.40 +        }
    2.41 +
    2.42 +        ||
    2.43          when "@type='IdentityList'"
    2.44          ||
    2.45          {