telepathy-idle: Parser: spell out prefix vs. non-prefix logic better

Will Thompson wjt at kemper.freedesktop.org
Fri Nov 2 04:56:49 PDT 2012


Module: telepathy-idle
Branch: master
Commit: 0bbe346a069316f2b4571834791abc6e2ed3e4d7
URL:    http://cgit.freedesktop.org/telepathy/telepathy-idle/commit/?id=0bbe346a069316f2b4571834791abc6e2ed3e4d7

Author: Will Thompson <will.thompson at collabora.co.uk>
Date:   Tue Oct 30 14:12:04 2012 +0000

Parser: spell out prefix vs. non-prefix logic better

---

 src/idle-parser.c |    4 ++--
 src/idle-parser.h |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/idle-parser.c b/src/idle-parser.c
index 5e7ede0..170f299 100644
--- a/src/idle-parser.c
+++ b/src/idle-parser.c
@@ -352,10 +352,10 @@ static void _parse_message(IdleParser *parser, const gchar *split_msg) {
 	for (int i = 0; i < IDLE_PARSER_LAST_MESSAGE_CODE; i++) {
 		const MessageSpec *spec = &(message_specs[i]);
 
-		if ((split_msg[0] != ':') && (i <= IDLE_PARSER_CMD_PING)) {
+		if ((split_msg[0] != ':') && (i <= IDLE_PARSER_LAST_NON_PREFIX_CMD)) {
 			if (!g_ascii_strcasecmp(tokens[0], spec->str))
 				_parse_and_forward_one(parser, tokens, spec->code, spec->format);
-		} else if (i >= IDLE_PARSER_PREFIXCMD_INVITE) {
+		} else if (i > IDLE_PARSER_LAST_NON_PREFIX_CMD) {
 			if (!g_ascii_strcasecmp(tokens[2], spec->str))
 				_parse_and_forward_one(parser, tokens, spec->code, spec->format);
 		}
diff --git a/src/idle-parser.h b/src/idle-parser.h
index fb68e3d..a900b00 100644
--- a/src/idle-parser.h
+++ b/src/idle-parser.h
@@ -49,6 +49,8 @@ typedef enum {
 	IDLE_PARSER_CMD_ERROR = 0,
 	IDLE_PARSER_CMD_PING,
 
+	IDLE_PARSER_LAST_NON_PREFIX_CMD = IDLE_PARSER_CMD_PING,
+
 	IDLE_PARSER_PREFIXCMD_INVITE,
 	IDLE_PARSER_PREFIXCMD_JOIN,
 	IDLE_PARSER_PREFIXCMD_KICK,



More information about the telepathy-commits mailing list