Fix server-side compilation warnings

diff --git a/mapiproxy/servers/default/emsmdb/dcesrv_exchange_emsmdb.c b/mapiproxy/servers/default/emsmdb/dcesrv_exchange_emsmdb.c
index fb3b5046e0aebf44a9eec79dc9c4cc114b9e2375..2fd1c6ca1e89393084652cbbeffd0adc01a5b7ed 100644 (file)
--- a/mapiproxy/servers/default/emsmdb/dcesrv_exchange_emsmdb.c
+++ b/mapiproxy/servers/default/emsmdb/dcesrv_exchange_emsmdb.c
@@ -410,12 +410,18 @@ static bool emsmdbp_fill_notification(TALLOC_CTX *mem_ctx,
                         reply->NotificationData.SearchTableChange.TableEvent = TABLE_CHANGED;
                         switch (notification->event) {
                         case MAPISTORE_OBJECT_CREATED:
-                        /* case MAPISTORE_OBJECT_MODIFIED: */
+                               /* case MAPISTORE_OBJECT_MODIFIED: */
                                 reply->NotificationData.HierarchyTableChange.TableEvent = (notification->event == MAPISTORE_OBJECT_CREATED ? TABLE_ROW_ADDED : TABLE_ROW_MODIFIED);
                                 reply->NotificationData.HierarchyTableChange.HierarchyTableChangeUnion.HierarchyRowAddedNotification.FID = notification->parameters.table_parameters.object_id;
                                 reply->NotificationData.HierarchyTableChange.HierarchyTableChangeUnion.HierarchyRowAddedNotification.InsertAfterFID = prev_fid;
                                 reply->NotificationData.HierarchyTableChange.HierarchyTableChangeUnion.HierarchyRowAddedNotification.Columns = *table_row;
                                 break;
+                       case MAPISTORE_OBJECT_MODIFIED:
+                       case MAPISTORE_OBJECT_DELETED:
+                       case MAPISTORE_OBJECT_COPIED:
+                       case MAPISTORE_OBJECT_MOVED:
+                       case MAPISTORE_OBJECT_NEWMAIL:
+                               break;
                         /* case MAPISTORE_OBJECT_DELETED: */
                         /*         reply->NotificationData.HierarchyTableChange.TableEvent = TABLE_ROW_DELETED; */
                         /*         reply->NotificationData.HierarchyTableChange.HierarchyTableChangeUnion.HierarchyRowDeletedNotification.FID = notification->parameters.table_parameters.object_id; */
@@ -503,6 +509,12 @@ static bool emsmdbp_fill_notification(TALLOC_CTX *mem_ctx,
                         /*         reply->NotificationType = fnevCriticalError; */
                         /*         DEBUG(5, ("unknown value for notification event: %d\n", notification->event)); */
                         /*         goto end; */
+                       case MAPISTORE_OBJECT_MODIFIED:
+                       case MAPISTORE_OBJECT_DELETED:
+                       case MAPISTORE_OBJECT_COPIED:
+                       case MAPISTORE_OBJECT_MOVED:
+                       case MAPISTORE_OBJECT_NEWMAIL:
+                               break;
                         }
                 }
         }

diff --git a/mapiproxy/servers/default/emsmdb/dcesrv_exchange_emsmdb.h b/mapiproxy/servers/default/emsmdb/dcesrv_exchange_emsmdb.h
index e0c05209fd9f1eae63039df6f3b41f413a63f6a5..988c6c98b4f3e7c0333bffe4820beedebcd9b9da 100644 (file)
--- a/mapiproxy/servers/default/emsmdb/dcesrv_exchange_emsmdb.h
+++ b/mapiproxy/servers/default/emsmdb/dcesrv_exchange_emsmdb.h
@@ -29,6 +29,7 @@
 #include "mapiproxy/libmapistore/mapistore_errors.h"
 #include <ldb.h>
 #include <ldb_errors.h>
+#include <tevent.h>
 #include <util/debug.h>
 #include <time.h>
 #include <inttypes.h>

diff --git a/mapiproxy/servers/default/emsmdb/emsmdbp_object.c b/mapiproxy/servers/default/emsmdb/emsmdbp_object.c
index ae88d5dc245c32c39d82b89d0fa2b5e2a22ed6df..9b32b6b90af6d02cdf2de63f8888b7c69004d26d 100644 (file)
--- a/mapiproxy/servers/default/emsmdb/emsmdbp_object.c
+++ b/mapiproxy/servers/default/emsmdb/emsmdbp_object.c
@@ -694,6 +694,13 @@ static int emsmdbp_object_destructor(void *data)
                        talloc_free(object->object.subscription->subscription_list);
                 }
                break;
+       case EMSMDBP_OBJECT_UNDEF:
+       case EMSMDBP_OBJECT_MAILBOX:
+       case EMSMDBP_OBJECT_MESSAGE:
+       case EMSMDBP_OBJECT_ATTACHMENT:
+       case EMSMDBP_OBJECT_FTCONTEXT:
+       case EMSMDBP_OBJECT_SYNCCONTEXT:
+               break;
        }
        
 nomapistore:

diff --git a/mapiproxy/servers/default/nspi/dcesrv_exchange_nsp.h b/mapiproxy/servers/default/nspi/dcesrv_exchange_nsp.h
index b6a254ed6ca213d2d6b992973998f6ffaf172664..8de4e7d3e2f86a241d7b07deefced0d2b01d2066 100644 (file)
--- a/mapiproxy/servers/default/nspi/dcesrv_exchange_nsp.h
+++ b/mapiproxy/servers/default/nspi/dcesrv_exchange_nsp.h
@@ -27,6 +27,7 @@
 #include "mapiproxy/libmapiproxy/libmapiproxy.h"
 #include <ldb.h>
 #include <ldb_errors.h>
+#include <tevent.h>
 #include <fcntl.h>
 #include <util/debug.h>
 

diff --git a/mapiproxy/servers/default/nspi/emsabp.c b/mapiproxy/servers/default/nspi/emsabp.c
index 757ca58f25cf08f77b694dcb38b61c401c9e67fc..e5cd324087811470f6e0c1c5c165e1ce82efa606 100644 (file)
--- a/mapiproxy/servers/default/nspi/emsabp.c
+++ b/mapiproxy/servers/default/nspi/emsabp.c
@@ -1121,7 +1121,7 @@ _PUBLIC_ enum MAPISTATUS emsabp_search(TALLOC_CTX *mem_ctx, struct emsabp_contex
                return MAPI_E_TABLE_TOO_BIG;
        }
 
-       MIds->aulPropTag = (enum MAPITAGS *) talloc_array(mem_ctx, uint32_t, res->count);
+       MIds->aulPropTag = (uint32_t *) talloc_array(mem_ctx, uint32_t, res->count);
        MIds->cValues = res->count;
 
        /* Step 2. Create session MId for all fetched records */