Cast values and prevent g++ from compilation errors

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

diff --git a/trunk/mapiproxy/servers/default/nspi/dcesrv_exchange_nsp.c b/trunk/mapiproxy/servers/default/nspi/dcesrv_exchange_nsp.c
index 030a987db6dd873ee32331d1d2ea09d1b9497f6f..a3698b83e2a25171aafd6e3068a8c4376d461bb8 100644 (file)
--- a/trunk/mapiproxy/servers/default/nspi/dcesrv_exchange_nsp.c
+++ b/trunk/mapiproxy/servers/default/nspi/dcesrv_exchange_nsp.c
@@ -3,7 +3,7 @@
 
    OpenChange Project
 
-   Copyright (C) Julien Kerihuel 2009
+   Copyright (C) Julien Kerihuel 2009-2011
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -189,7 +189,7 @@ static enum MAPISTATUS dcesrv_NspiUnbind(struct dcesrv_call_state *dce_call,
                }
        }
 
-       r->out.result = 1;
+       r->out.result = (enum MAPISTATUS) 1;
 
        return MAPI_E_SUCCESS;
 }
@@ -491,7 +491,7 @@ static enum MAPISTATUS dcesrv_NspiDNToMId(struct dcesrv_call_state *dce_call,
                /* Step 1. Check if the input legacyDN exists */
          retval = emsabp_search_legacyExchangeDN(emsabp_ctx, r->in.pNames->Strings[i], &msg, &pbUseConfPartition);
                if (retval != MAPI_E_SUCCESS) {
-                       r->out.ppMIds[0]->aulPropTag[i] = 0;
+                 r->out.ppMIds[0]->aulPropTag[i] = (enum MAPITAGS) 0;
                } else {
                        TDB_CONTEXT *tdb_ctx = (pbUseConfPartition ? emsabp_ctx->tdb_ctx : emsabp_ctx->ttdb_ctx);
                        dn = ldb_msg_find_attr_as_string(msg, "distinguishedName", NULL);
@@ -500,7 +500,7 @@ static enum MAPISTATUS dcesrv_NspiDNToMId(struct dcesrv_call_state *dce_call,
                                retval = emsabp_tdb_insert(tdb_ctx, dn);
                                retval = emsabp_tdb_fetch_MId(tdb_ctx, dn, &MId);
                        }
-                       r->out.ppMIds[0]->aulPropTag[i] = MId;
+                       r->out.ppMIds[0]->aulPropTag[i] = (enum MAPITAGS) MId;
                }
        }
 
@@ -594,7 +594,7 @@ static enum MAPISTATUS dcesrv_NspiGetProps(struct dcesrv_call_state *dce_call,
                                ulPropTag = r->in.pPropTags->aulPropTag[i];
                                ulPropTag = (ulPropTag & 0xFFFF0000) | PT_ERROR;
 
-                               aRow->lpProps[i].ulPropTag = ulPropTag;
+                               aRow->lpProps[i].ulPropTag = (enum MAPITAGS) ulPropTag;
                                aRow->lpProps[i].dwAlignPad = 0x0;
                                set_SPropValue(&(aRow->lpProps[i]), NULL);
                        }

diff --git a/trunk/mapiproxy/servers/default/nspi/emsabp.c b/trunk/mapiproxy/servers/default/nspi/emsabp.c
index 4c8a285cdd3e7a2833f403a9b30ebd189129fc61..35989d09b662d57f6241556decdd19742915c9b1 100644 (file)
--- a/trunk/mapiproxy/servers/default/nspi/emsabp.c
+++ b/trunk/mapiproxy/servers/default/nspi/emsabp.c
@@ -3,7 +3,7 @@
 
    EMSABP: Address Book Provider implementation
 
-   Copyright (C) Julien Kerihuel 2006-2009.
+   Copyright (C) Julien Kerihuel 2006-2011.
    Copyright (C) Pauline Khun 2006.
 
    This program is free software; you can redistribute it and/or modify
@@ -597,7 +597,7 @@ _PUBLIC_ enum MAPISTATUS emsabp_fetch_attrs_from_msg(TALLOC_CTX *mem_ctx,
                        ulPropTag = (ulPropTag & 0xFFFF0000) | PT_ERROR;
                }
                
-               aRow->lpProps[i].ulPropTag = ulPropTag;
+               aRow->lpProps[i].ulPropTag = (enum MAPITAGS) ulPropTag;
                aRow->lpProps[i].dwAlignPad = 0x0;
                set_SPropValue(&(aRow->lpProps[i]), data);
        }
@@ -670,7 +670,7 @@ _PUBLIC_ enum MAPISTATUS emsabp_fetch_attrs(TALLOC_CTX *mem_ctx, struct emsabp_c
                        ulPropTag += PT_ERROR;
                }
 
-               aRow->lpProps[i].ulPropTag = ulPropTag;
+               aRow->lpProps[i].ulPropTag = (enum MAPITAGS) ulPropTag;
                aRow->lpProps[i].dwAlignPad = 0x0;
                set_SPropValue(&(aRow->lpProps[i]), data);
        }
@@ -709,6 +709,7 @@ _PUBLIC_ enum MAPISTATUS emsabp_table_fetch_attrs(TALLOC_CTX *mem_ctx, struct em
        enum MAPISTATUS                 retval;
        struct SPropTagArray            *SPropTagArray;
        struct SPropValue               lpProps;
+       int                             proptag;
        uint32_t                        i;
        uint32_t                        containerID = 0;
        const char                      *dn = NULL;
@@ -820,15 +821,19 @@ _PUBLIC_ enum MAPISTATUS emsabp_table_fetch_attrs(TALLOC_CTX *mem_ctx, struct em
                        case PR_DISPLAY_NAME:
                                lpProps.value.lpszA = talloc_strdup(mem_ctx, ldb_msg_find_attr_as_string(msg, "displayName", NULL));
                                if (!lpProps.value.lpszA) {
-                                       lpProps.ulPropTag &= 0xFFFF0000;
-                                       lpProps.ulPropTag += PT_ERROR;
+                                       proptag = (int) lpProps.ulPropTag;
+                                       proptag &= 0xFFFF0000;
+                                       proptag += PT_ERROR;
+                                       lpProps.ulPropTag = (enum MAPITAGS) proptag;
                                }
                                break;
                        case PR_DISPLAY_NAME_UNICODE:
                                lpProps.value.lpszW = talloc_strdup(mem_ctx, ldb_msg_find_attr_as_string(msg, "displayName", NULL));
                                if (!lpProps.value.lpszW) {
-                                       lpProps.ulPropTag &= 0xFFFF0000;
-                                       lpProps.ulPropTag += PT_ERROR;
+                                       proptag = (int) lpProps.ulPropTag;
+                                       proptag &= 0xFFFF0000;
+                                       proptag += PT_ERROR;
+                                       lpProps.ulPropTag = (enum MAPITAGS) proptag;
                                }
                                break;
                        case PR_EMS_AB_IS_MASTER: