libmapi: change mapidump_recipients to use PropertyTagArray_r

This matches the ResolveNames() argument, and fixes 3 warnings.

git-svn-id: https://svn.openchange.org/openchange@2644 71d39326-ef09-db11-b2a4-00e04c779ad1

diff --git a/trunk/libmapi/libmapi.h b/trunk/libmapi/libmapi.h
index d81c4e37fc4a00b978cb2718eea8e090f4532e47..355069ee57a216c66a492cac04ccbb89dea9ec34 100644 (file)
--- a/trunk/libmapi/libmapi.h
+++ b/trunk/libmapi/libmapi.h
@@ -168,7 +168,7 @@ void                        mapidump_SPropTagArray(struct SPropTagArray *);
 void                   mapidump_SRowSet(struct SRowSet *, const char *);
 void                   mapidump_SRow(struct SRow *, const char *);
 void                   mapidump_PAB_entry(struct SRow *);
-void                   mapidump_Recipients(const char **, struct SRowSet *, struct SPropTagArray *);
+void                   mapidump_Recipients(const char **, struct SRowSet *, struct PropertyTagArray_r *flaglist);
 void                   mapidump_date(struct mapi_SPropValue_array *, uint32_t, const char *);
 void                   mapidump_date_SPropValue(struct SPropValue, const char *, const char *);
 void                   mapidump_message_summary(mapi_object_t *);

diff --git a/trunk/libmapi/mapidump.c b/trunk/libmapi/mapidump.c
index c05cc49bfb81be7f249f0e76d9ac9147ec7ed380..134a698dbf61caa284578c266d81d2400459dad3 100644 (file)
--- a/trunk/libmapi/mapidump.c
+++ b/trunk/libmapi/mapidump.c
@@ -236,7 +236,7 @@ _PUBLIC_ void mapidump_PAB_entry(struct SRow *aRow)
 }
 
 
-_PUBLIC_ void mapidump_Recipients(const char **usernames, struct SRowSet *rowset, struct SPropTagArray *flaglist)
+_PUBLIC_ void mapidump_Recipients(const char **usernames, struct SRowSet *rowset, struct PropertyTagArray_r *flaglist)
 {
        uint32_t                i;
        uint32_t                j;

diff --git a/trunk/utils/mapitest/modules/module_mapidump.c b/trunk/utils/mapitest/modules/module_mapidump.c
index de7d6c60b99cc3ed52ebb2165f82afb950b2a1a3..d334a4d6ca8f8cf7a0302549d86f644e48f999fa 100644 (file)
--- a/trunk/utils/mapitest/modules/module_mapidump.c
+++ b/trunk/utils/mapitest/modules/module_mapidump.c
@@ -757,10 +757,10 @@ _PUBLIC_ bool mapitest_mapidump_freebusy(struct mapitest *mt)
 */ 
 _PUBLIC_ bool mapitest_mapidump_recipients(struct mapitest *mt)
 {
-       const char              **userlist;
-       struct SRowSet          resolved;
-       struct SPropTagArray    *flaglist;
-       struct SPropValue       SPropValue;
+       const char                      **userlist;
+       struct SRowSet                  resolved;
+       struct PropertyTagArray_r       flaglist;
+       struct SPropValue               SPropValue;
 
        userlist = talloc_array(mt->mem_ctx, const char*, 3);
        userlist[0] = "Mr. Unresolved";
@@ -779,9 +779,15 @@ _PUBLIC_ bool mapitest_mapidump_recipients(struct mapitest *mt)
        SPropValue.value.lpszA = "gname";
        SRow_addprop(&(resolved.aRow[0]), SPropValue);
 
-       flaglist = set_SPropTagArray(mt->mem_ctx, 3, MAPI_UNRESOLVED, MAPI_AMBIGUOUS, MAPI_RESOLVED);
+       flaglist.cValues = 3;
+       flaglist.aulPropTag = talloc_zero_array(mt->mem_ctx, uint32_t, flaglist.cValues);
+       flaglist.aulPropTag[0] = MAPI_UNRESOLVED;
+       flaglist.aulPropTag[1] = MAPI_AMBIGUOUS;
+       flaglist.aulPropTag[2] = MAPI_RESOLVED;
        
-       mapidump_Recipients(userlist, &resolved, flaglist);
+       mapidump_Recipients(userlist, &resolved, &flaglist);
+
+       talloc_free(flaglist.aulPropTag);
 
        return true;
 }