[dovecot-cvs] dovecot/src/lib-index mail-index-data.c,1.31,1.32 mail-index-util.c,1.16,1.17 mail-index.c,1.75,1.76 mail-lockdir.c,1.2,1.3 mail-tree-redblack.c,1.19,1.20
cras at procontrol.fi
cras at procontrol.fi
Wed Dec 18 03:52:17 EET 2002
Update of /home/cvs/dovecot/src/lib-index
In directory danu:/tmp/cvs-serv24843
Modified Files:
mail-index-data.c mail-index-util.c mail-index.c
mail-lockdir.c mail-tree-redblack.c
Log Message:
Try not to split strings to multiple lines from the middle of human readable
text. Makes it easier to grep for them.
Index: mail-index-data.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mail-index-data.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- mail-index-data.c 4 Nov 2002 09:54:46 -0000 1.31
+++ mail-index-data.c 18 Dec 2002 01:52:14 -0000 1.32
@@ -182,11 +182,10 @@
}
if (hdr->used_file_size > data->mmap_full_length) {
- index_data_set_corrupted(data, "used_file_size larger than "
- "real file size (%"PRIuUOFF_T
- " vs %"PRIuSIZE_T")",
- hdr->used_file_size,
- data->mmap_full_length);
+ index_data_set_corrupted(data,
+ "used_file_size larger than real file size "
+ "(%"PRIuUOFF_T" vs %"PRIuSIZE_T")",
+ hdr->used_file_size, data->mmap_full_length);
return FALSE;
}
@@ -545,9 +544,9 @@
}
if ((pos % MEM_ALIGN_SIZE) != 0) {
- index_data_set_corrupted(data,
- "Data position (%"PRIuUOFF_T") is not memory aligned "
- "for record %u", pos, index_rec->uid);
+ index_data_set_corrupted(data, "Data position (%"PRIuUOFF_T") "
+ "is not memory aligned for record %u",
+ pos, index_rec->uid);
return NULL;
}
@@ -604,10 +603,10 @@
}
if ((rec->full_field_size % MEM_ALIGN_SIZE) != 0) {
- index_data_set_corrupted(data,
- "Field %d size %u is not memory aligned "
- "for record %u", (int)field,
- rec->full_field_size, index_rec->uid);
+ index_data_set_corrupted(data, "Field %d size %u "
+ "is not memory aligned for record %u",
+ (int)field, rec->full_field_size,
+ index_rec->uid);
break;
}
Index: mail-index-util.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mail-index-util.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- mail-index-util.c 6 Dec 2002 01:09:22 -0000 1.16
+++ mail-index-util.c 18 Dec 2002 01:52:14 -0000 1.17
@@ -128,9 +128,9 @@
return index_set_syscall_error(index, "file_wait_lock()");
if (ret == 0) {
- index_set_error(index, "Timeout while waiting for "
- "release of fcntl() lock for index file "
- "%s", index->filepath);
+ index_set_error(index, "Timeout while waiting for release of "
+ "fcntl() lock for index file %s",
+ index->filepath);
index->index_lock_timeout = TRUE;
return FALSE;
}
Index: mail-index.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mail-index.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- mail-index.c 25 Nov 2002 19:02:49 -0000 1.75
+++ mail-index.c 18 Dec 2002 01:52:14 -0000 1.76
@@ -45,9 +45,10 @@
index->header = hdr;
if (hdr->used_file_size > index->mmap_full_length) {
- index_set_corrupted(index, "used_file_size larger than real "
- "file size (%"PRIuUOFF_T" vs %"PRIuSIZE_T
- ")", hdr->used_file_size,
+ index_set_corrupted(index,
+ "used_file_size larger than real file size "
+ "(%"PRIuUOFF_T" vs %"PRIuSIZE_T")",
+ hdr->used_file_size,
index->mmap_full_length);
return FALSE;
}
@@ -527,9 +528,10 @@
/* find from binary tree */
idx = mail_tree_lookup_sequence(index->tree, seq);
if (idx == (unsigned int)-1) {
- index_set_corrupted(index, "Sequence %u not found from "
- "binary tree (%u msgs says header)",
- seq, hdr->messages_count);
+ index_set_corrupted(index,
+ "Sequence %u not found from binary tree "
+ "(%u msgs says header)",
+ seq, hdr->messages_count);
return NULL;
}
format = "Invalid offset returned by binary tree: %"PRIuUOFF_T;
@@ -731,15 +733,14 @@
index->header->first_unseen_uid_lowwater = rec->uid;
if (index->header->seen_messages_count == 0) {
- index_set_corrupted(index, "seen_messages_count in "
- "header is invalid");
+ index_set_corrupted(index,
+ "seen_messages_count in header is invalid");
} else {
index->header->seen_messages_count--;
}
}
- if ((old_flags & MAIL_DELETED) == 0 &&
- (new_flags & MAIL_DELETED)) {
+ if ((old_flags & MAIL_DELETED) == 0 && (new_flags & MAIL_DELETED)) {
/* undeleted -> deleted */
index->header->deleted_messages_count++;
@@ -752,8 +753,8 @@
(new_flags & MAIL_DELETED) == 0) {
/* deleted -> undeleted */
if (index->header->deleted_messages_count == 0) {
- index_set_corrupted(index, "deleted_messages_count in "
- "header is invalid");
+ index_set_corrupted(index,
+ "deleted_messages_count in header is invalid");
} else {
index->header->deleted_messages_count--;
}
@@ -848,8 +849,8 @@
/* update message counts */
if (hdr->messages_count == 0) {
/* corrupted */
- index_set_corrupted(index, "Header says there's no mail "
- "while expunging");
+ index_set_corrupted(index,
+ "Header says there's no mail while expunging");
return FALSE;
}
Index: mail-lockdir.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mail-lockdir.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mail-lockdir.c 15 Sep 2002 06:30:29 -0000 1.2
+++ mail-lockdir.c 18 Dec 2002 01:52:14 -0000 1.3
@@ -150,8 +150,9 @@
}
if (time(NULL) > max_wait_time) {
- index_set_error(index, "Timeout waiting lock in "
- "directory %s", index->dir);
+ index_set_error(index,
+ "Timeout waiting for lock in directory %s",
+ index->dir);
return FALSE;
}
Index: mail-tree-redblack.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mail-tree-redblack.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- mail-tree-redblack.c 28 Oct 2002 07:51:50 -0000 1.19
+++ mail-tree-redblack.c 18 Dec 2002 01:52:14 -0000 1.20
@@ -639,7 +639,8 @@
if (x != RBNULL) {
n++;
- i_error("Tree: %*s %u: left=%u, right=%u, color=%s, nodes=%u, key=%u",
+ i_error("Tree: %*s %u: left=%u, right=%u, color=%s, "
+ "nodes=%u, key=%u",
n, "", x, node[x].left, node[x].right,
IS_NODE_BLACK(node[x]) ? "BLACK" : "RED",
NODE_COUNT(node[x]), node[x].key);
More information about the dovecot-cvs
mailing list