Removed NBO32_BIT* stuff

--HG--
branch : HEAD

diff --git a/src/lib-index/mail-cache.h b/src/lib-index/mail-cache.h
index 3526b648923625c90879f736bf814cc3172bd08a..6d476c4b180a975cbf6ae6d7594153315ab00aed 100644 (file)
--- a/src/lib-index/mail-cache.h
+++ b/src/lib-index/mail-cache.h
@@ -1,7 +1,6 @@
 #ifndef __MAIL_CACHE_H
 #define __MAIL_CACHE_H
 
-#include "byteorder.h"
 #include "mail-index.h"
 
 #define MAIL_CACHE_FILE_PREFIX ".cache"
@@ -12,25 +11,25 @@ struct mail_cache_transaction_ctx;
 
 enum mail_cache_field {
        /* fixed size fields */
-       MAIL_CACHE_INDEX_FLAGS          = NBO32_BIT0,
-       MAIL_CACHE_LOCATION_OFFSET      = NBO32_BIT1,
-       MAIL_CACHE_MD5                  = NBO32_BIT2,
-       MAIL_CACHE_SENT_DATE            = NBO32_BIT3,
-       MAIL_CACHE_RECEIVED_DATE        = NBO32_BIT4,
-       MAIL_CACHE_HEADER_SIZE          = NBO32_BIT5,
-       MAIL_CACHE_BODY_SIZE            = NBO32_BIT6,
-       MAIL_CACHE_VIRTUAL_HEADER_SIZE  = NBO32_BIT7,
-       MAIL_CACHE_VIRTUAL_FULL_SIZE    = NBO32_BIT8,
+       MAIL_CACHE_INDEX_FLAGS          = 0x00000001,
+       MAIL_CACHE_LOCATION_OFFSET      = 0x00000002,
+       MAIL_CACHE_MD5                  = 0x00000004,
+       MAIL_CACHE_SENT_DATE            = 0x00000008,
+       MAIL_CACHE_RECEIVED_DATE        = 0x00000010,
+       MAIL_CACHE_HEADER_SIZE          = 0x00000020,
+       MAIL_CACHE_BODY_SIZE            = 0x00000040,
+       MAIL_CACHE_VIRTUAL_HEADER_SIZE  = 0x00000080,
+       MAIL_CACHE_VIRTUAL_FULL_SIZE    = 0x00000100,
 
        /* variable sized field */
-       MAIL_CACHE_HEADERS1             = NBO32_BIT31,
-       MAIL_CACHE_HEADERS2             = NBO32_BIT30,
-       MAIL_CACHE_HEADERS3             = NBO32_BIT29,
-       MAIL_CACHE_HEADERS4             = NBO32_BIT28,
-       MAIL_CACHE_LOCATION             = NBO32_BIT27,
-       MAIL_CACHE_BODY                 = NBO32_BIT26,
-       MAIL_CACHE_BODYSTRUCTURE        = NBO32_BIT25,
-       MAIL_CACHE_MESSAGEPART          = NBO32_BIT24,
+       MAIL_CACHE_HEADERS1             = 0x40000000,
+       MAIL_CACHE_HEADERS2             = 0x20000000,
+       MAIL_CACHE_HEADERS3             = 0x10000000,
+       MAIL_CACHE_HEADERS4             = 0x08000000,
+       MAIL_CACHE_LOCATION             = 0x04000000,
+       MAIL_CACHE_BODY                 = 0x02000000,
+       MAIL_CACHE_BODYSTRUCTURE        = 0x01000000,
+       MAIL_CACHE_MESSAGEPART          = 0x00800000,
 
        MAIL_CACHE_FIXED_MASK           = MAIL_CACHE_INDEX_FLAGS |
                                          MAIL_CACHE_LOCATION_OFFSET |
@@ -43,7 +42,7 @@ enum mail_cache_field {
                                          MAIL_CACHE_VIRTUAL_FULL_SIZE,
        MAIL_CACHE_HEADERS_MASK         = MAIL_CACHE_HEADERS1 |
                                          MAIL_CACHE_HEADERS2 |
-                                         MAIL_CACHE_HEADERS4 |
+                                         MAIL_CACHE_HEADERS3 |
                                          MAIL_CACHE_HEADERS4,
        MAIL_CACHE_STRING_MASK          = MAIL_CACHE_HEADERS_MASK |
                                          MAIL_CACHE_LOCATION |

diff --git a/src/lib-index/mail-index.h b/src/lib-index/mail-index.h
index 5d171a09dba6a0a952a4da5f2ec64e88bd7a70a8..d123136a50bfc02cc4a4bb3b9616e3ad6edc0286 100644 (file)
--- a/src/lib-index/mail-index.h
+++ b/src/lib-index/mail-index.h
@@ -1,7 +1,6 @@
 #ifndef __MAIL_INDEX_H
 #define __MAIL_INDEX_H
 
-#include "byteorder.h"
 #include "file-dotlock.h"
 #include "message-parser.h"
 #include "imap-util.h"
@@ -29,13 +28,13 @@ enum mail_index_header_flag {
        /* Rebuild flag is set while index is being rebuilt or when
           some error is noticed in the index file. If this flag is set,
           the index shouldn't be used before rebuilding it. */
-       MAIL_INDEX_HDR_FLAG_FSCK                = NBO32_BIT0,
-       MAIL_INDEX_HDR_FLAG_REBUILD             = NBO32_BIT1,
-       MAIL_INDEX_HDR_FLAG_COMPRESS            = NBO32_BIT2,
-       MAIL_INDEX_HDR_FLAG_COMPRESS_CACHE      = NBO32_BIT3,
-       MAIL_INDEX_HDR_FLAG_DIRTY_MESSAGES      = NBO32_BIT4,
-       MAIL_INDEX_HDR_FLAG_DIRTY_CUSTOMFLAGS   = NBO32_BIT5,
-       MAIL_INDEX_HDR_FLAG_MAILDIR_NEW         = NBO32_BIT6
+       MAIL_INDEX_HDR_FLAG_FSCK                = 0x0001,
+       MAIL_INDEX_HDR_FLAG_REBUILD             = 0x0002,
+       MAIL_INDEX_HDR_FLAG_COMPRESS            = 0x0004,
+       MAIL_INDEX_HDR_FLAG_COMPRESS_CACHE      = 0x0008,
+       MAIL_INDEX_HDR_FLAG_DIRTY_MESSAGES      = 0x0010,
+       MAIL_INDEX_HDR_FLAG_DIRTY_CUSTOMFLAGS   = 0x0020,
+       MAIL_INDEX_HDR_FLAG_MAILDIR_NEW         = 0x0040
 };
 
 enum mail_index_record_flag {
@@ -43,20 +42,20 @@ enum mail_index_record_flag {
           missing CRs. So this flag may be set as an optimization for
           regular non-binary mails as well if it's known that it contains
           valid CR+LF line breaks. */
-       MAIL_INDEX_FLAG_BINARY_HEADER   = NBO32_BIT0,
-       MAIL_INDEX_FLAG_BINARY_BODY     = NBO32_BIT1,
+       MAIL_INDEX_FLAG_BINARY_HEADER           = 0x0001,
+       MAIL_INDEX_FLAG_BINARY_BODY             = 0x0002,
 
        /* Mail flags have been changed in index, but not written into
           actual mailbox yet. */
-       MAIL_INDEX_FLAG_DIRTY           = NBO32_BIT2,
+       MAIL_INDEX_FLAG_DIRTY                   = 0x0004,
 
        /* Maildir: Mail file is in new/ dir instead of cur/ */
-       MAIL_INDEX_FLAG_MAILDIR_NEW     = NBO32_BIT3,
+       MAIL_INDEX_FLAG_MAILDIR_NEW             = 0x0008,
 
        /* Mail header or body is known to contain NUL characters. */
-       MAIL_INDEX_FLAG_HAS_NULS        = NBO32_BIT4,
+       MAIL_INDEX_FLAG_HAS_NULS                = 0x0010,
        /* Mail header or body is known to not contain NUL characters. */
-       MAIL_INDEX_FLAG_HAS_NO_NULS     = NBO32_BIT5
+       MAIL_INDEX_FLAG_HAS_NO_NULS             = 0x0020
 };
 
 enum mail_lock_type {