The strncmp() call in count_messages() was doing the same comparison that
strstr() did, so there was no need to call it. A little rewrite and
count_messages() is simpler.
Obviously no huge benefit, as it's not frequently called. I'm just getting
familiar with git.
Signed-off-by: Andy Parkins <andyparkins@xxxxxxxxx>
---
imap-send.c | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/imap-send.c b/imap-send.c
index 16804ab..cfac17b 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -1198,15 +1198,14 @@ count_messages( msg_data_t *msg )
int count = 0;
char *p = msg->data;
- while (1) {
- if (!strncmp( "From ", p, 5 )) {
- count++;
+ while (p) {
+ p = strstr( p, "From " );
+ if ( p != NULL ) {
+ if ( p == msg->data || *(p-1) == '\n' ) {
+ count++;
+ }
p += 5;
}
- p = strstr( p+5, "\nFrom ");
- if (!p)
- break;
- p++;
}
return count;
}
--
1.4.2.3
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html