Mercurial > ~mikael > mcabber > hg
diff mcabber/src/utils.c @ 1058:c0d44a9a99bc
Code cleanup
Cosmetics. Mostly get rid of "jid" variables, as it is a structure pointer
defined in libjabber/jabber.h.
| author | Mikael Berthe <mikael@lilotux.net> |
|---|---|
| date | Thu, 30 Nov 2006 19:51:09 +0100 |
| parents | ea939ff047d8 |
| children | 8e12137fab20 |
line wrap: on
line diff
--- a/mcabber/src/utils.c Tue Nov 28 07:14:59 2006 +0100 +++ b/mcabber/src/utils.c Thu Nov 30 19:51:09 2006 +0100 @@ -306,27 +306,27 @@ * Check if the full JID is valid * Return 0 if it is valid, non zero otherwise */ -int check_jid_syntax(char *jid) +int check_jid_syntax(char *fjid) { char *str; char *domain, *resource; int domlen; - if (!jid) return 1; + if (!fjid) return 1; - domain = strchr(jid, JID_DOMAIN_SEPARATOR); + domain = strchr(fjid, JID_DOMAIN_SEPARATOR); /* the username is optional */ if (!domain) { - domain = jid; + domain = fjid; } else { /* node identifiers may not be longer than 1023 bytes */ - if ((domain == jid) || (domain-jid > 1023)) + if ((domain == fjid) || (domain-fjid > 1023)) return 1; domain++; /* check for low and invalid ascii characters in the username */ - for (str = jid; *str != JID_DOMAIN_SEPARATOR; str++) { + for (str = fjid; *str != JID_DOMAIN_SEPARATOR; str++) { if (*str <= ' ' || *str == ':' || *str == JID_DOMAIN_SEPARATOR || *str == '<' || *str == '>' || *str == '\'' || *str == '"' || *str == '&') {