From 90b80cdf7fc27f5da9aae91296875c80be5d7e13 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 2 Aug 2011 16:32:05 +0000 Subject: [PATCH] Monotone-Parent: 8024e7884f12b6b63830153922546ddf8d4f2ed8 Monotone-Revision: a59f6d7afaa2784c96352c1b819c57a31206c4bd Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-08-02T16:32:05 Monotone-Branch: ca.inverse.sogo --- OpenChange/MAPIStoreTable.m | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/OpenChange/MAPIStoreTable.m b/OpenChange/MAPIStoreTable.m index 861279473..e2c4b0e19 100644 --- a/OpenChange/MAPIStoreTable.m +++ b/OpenChange/MAPIStoreTable.m @@ -686,32 +686,33 @@ static Class NSDataK, NSStringK; switch (res->rt) { /* basic operators */ - case 0: state = [self evaluateAndRestriction: &res->res.resAnd - intoQualifier: qualifier]; + case RES_AND: state = [self evaluateAndRestriction: &res->res.resAnd + intoQualifier: qualifier]; break; - case 1: state = [self evaluateOrRestriction: &res->res.resOr - intoQualifier: qualifier]; + case RES_OR: state = [self evaluateOrRestriction: &res->res.resOr + intoQualifier: qualifier]; break; - case 2: state = [self evaluateNotRestriction: &res->res.resNot - intoQualifier: qualifier]; + case RES_NOT: state = [self evaluateNotRestriction: &res->res.resNot + intoQualifier: qualifier]; break; /* content restrictions */ - case 3: state = [self evaluateContentRestriction: &res->res.resContent - intoQualifier: qualifier]; + case RES_CONTENT: state = [self evaluateContentRestriction: &res->res.resContent + intoQualifier: qualifier]; break; - case 4: state = [self evaluatePropertyRestriction: &res->res.resProperty - intoQualifier: qualifier]; + case RES_PROPERTY: state = [self evaluatePropertyRestriction: &res->res.resProperty + intoQualifier: qualifier]; break; - case 6: state = [self evaluateBitmaskRestriction: &res->res.resBitmask - intoQualifier: qualifier]; + case RES_BITMASK: state = [self evaluateBitmaskRestriction: &res->res.resBitmask + intoQualifier: qualifier]; break; - case 7: state = MAPIRestrictionStateAlwaysTrue; /* let's cheat a little */ + case RES_SIZE: state = MAPIRestrictionStateAlwaysTrue; /* let's cheat a little */ break; - case 8: state = [self evaluateExistRestriction: &res->res.resExist - intoQualifier: qualifier]; + case RES_EXIST: state = [self evaluateExistRestriction: &res->res.resExist + intoQualifier: qualifier]; break; + // case 5: MAPIStringForComparePropsRestriction(&resPtr->res.resCompareProps); break; // case 7: MAPIStringForPropertyRestriction(&resPtr->res.resProperty); break; // case 9: MAPIStringForPropertyRestriction(&resPtr->res.resProperty); break;