- query->recipient_domain = memchr(query->recipient, '@', vlen);
- if (query->recipient_domain != NULL) {
- ++query->recipient_domain;
+ query->recipient_domain.str = memchr(query->recipient.str, '@', vlen);
+ if (query->recipient_domain.str != NULL) {
+ ++query->recipient_domain.str;
+ query->recipient_domain.len = query->recipient.len
+ - (query->recipient_domain.str - query->recipient.str);
+