merge
authorEdouard Tisserant <edouard@pep-project.org>
Tue, 02 Aug 2016 19:30:40 +0200
changeset 142fce442c16ead
parent 141 686dd3e262ad
parent 140 e825554c8160
child 143 aadf26861893
merge
     1.1 --- a/pEpiOSAdapter/PEPMessage.h	Tue Aug 02 14:28:22 2016 +0200
     1.2 +++ b/pEpiOSAdapter/PEPMessage.h	Tue Aug 02 19:30:40 2016 +0200
     1.3 @@ -7,16 +7,17 @@
     1.4  //
     1.5  
     1.6  #import <Foundation/Foundation.h>
     1.7 +
     1.8  #include "message_api.h"
     1.9  
    1.10 -NSArray *PEP_arrayFromStringlist(stringlist_t *sl);
    1.11 -stringlist_t *PEP_arrayToStringlist(NSArray *array);
    1.12 +NSArray * _Nonnull PEP_arrayFromStringlist(stringlist_t * _Nonnull sl);
    1.13 +stringlist_t * _Nullable PEP_arrayToStringlist(NSArray * _Nullable array);
    1.14  
    1.15 -pEp_identity *PEP_identityDictToStruct(NSDictionary *dict);
    1.16 -NSDictionary *PEP_identityDictFromStruct(pEp_identity *ident);
    1.17 +pEp_identity * _Nullable PEP_identityDictToStruct(NSDictionary * _Nullable dict);
    1.18 +NSDictionary * _Nonnull PEP_identityDictFromStruct(pEp_identity * _Nullable ident);
    1.19  
    1.20 -message *PEP_messageDictToStruct(NSDictionary *dict);
    1.21 -NSDictionary *PEP_messageDictFromStruct(message *msg);
    1.22 +message * _Nullable PEP_messageDictToStruct(NSDictionary * _Nullable dict);
    1.23 +NSDictionary * _Nonnull PEP_messageDictFromStruct(message * _Nullable msg);
    1.24  
    1.25  #pragma mark -- Constants
    1.26