← Back to branch summary

~ubuntu-branches/ubuntu/feisty/dovecot/feisty-updates

« back to all changes in this revision

Viewing changes to src/lib-storage/index/index-storage.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2006-11-27 20:47:11 UTC
  • mfrom: (1.10.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20061127204711-z7alg32xp4tnftjs
Tags: 1.0.rc15-1ubuntu1
* Merge from debian unstable. Remaining changes:
  - snakeoil ssl
  - Remove stop script symlinks from rc0 and rc6

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/lib-storage/index/index-storage.c
207
207
                return;
208
208
 
209
209
        for (arr = t_strsplit_spaces(fields, " ,"); *arr != NULL; arr++) {
210
 
                for (i = 0; i < MAIL_CACHE_FIELD_COUNT; i++) {
 
210
                for (i = 0; i < MAIL_INDEX_CACHE_FIELD_COUNT; i++) {
211
211
                        if (strcasecmp(global_cache_fields[i].name,
212
212
                                       *arr) == 0) {
213
213
                                global_cache_fields[i].decision = dec;
214
214
                                break;
215
215
                        }
216
216
                }
217
 
                if (i == MAIL_CACHE_FIELD_COUNT) {
 
217
                if (i == MAIL_INDEX_CACHE_FIELD_COUNT) {
218
218
                        i_error("%s: Invalid cache field name '%s', ignoring ",
219
219
                                set, *arr);
220
220
                }
252
252
        memcpy(ibox->cache_fields, global_cache_fields,
253
253
               sizeof(global_cache_fields));
254
254
        mail_cache_register_fields(cache, ibox->cache_fields,
255
 
                                   MAIL_CACHE_FIELD_COUNT);
 
255
                                   MAIL_INDEX_CACHE_FIELD_COUNT);
256
256
}
257
257
 
258
258
void index_storage_lock_notify(struct index_mailbox *ibox,
327
327
                     ibox->box.pool, sizeof(void *), 5);
328
328
 
329
329
        index_flags = move_to_memory ? 0 : MAIL_INDEX_OPEN_FLAG_CREATE;
330
 
        if ((flags & MAILBOX_OPEN_FAST) != 0)
331
 
                index_flags |= MAIL_INDEX_OPEN_FLAG_FAST;
332
330
        if ((storage->flags & MAIL_STORAGE_FLAG_MMAP_DISABLE) != 0)
333
331
                index_flags |= MAIL_INDEX_OPEN_FLAG_MMAP_DISABLE;
334
332
#ifndef MMAP_CONFLICTS_WRITE
348
346
                break;
349
347
        }
350
348
 
 
349
        ibox->open_flags = flags;
351
350
        ibox->readonly = (flags & MAILBOX_OPEN_READONLY) != 0;
352
351
        ibox->keep_recent = (flags & MAILBOX_OPEN_KEEP_RECENT) != 0;
353
352
        ibox->keep_locked = (flags & MAILBOX_OPEN_KEEP_LOCKED) != 0;