[PATCH 3/4] Update rename result to state

Zhenhua Zhang zhenhua.zhang at intel.com
Tue Mar 2 02:21:38 PST 2010


to avoid name conflict with GAtServerResult
---
 gatchat/gatserver.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gatchat/gatserver.c b/gatchat/gatserver.c
index 253a80a..df3c8bf 100644
--- a/gatchat/gatserver.c
+++ b/gatchat/gatserver.c
@@ -376,11 +376,11 @@ static void new_bytes(GAtServer *p)
 	unsigned int len = ring_buffer_len(p->read_buf);
 	unsigned int wrap = ring_buffer_len_no_wrap(p->read_buf);
 	unsigned char *buf = ring_buffer_read_ptr(p->read_buf, p->read_so_far);
-	enum ParserState result;
+	enum ParserState state;
 
 	while (p->channel && (p->read_so_far < len)) {
 		gsize rbytes = MIN(len - p->read_so_far, wrap - p->read_so_far);
-		result = server_feed(p, (char *)buf, &rbytes);
+		state = server_feed(p, (char *)buf, &rbytes);
 
 		if (p->v250.echo)
 			send_common(p, (char *)buf, rbytes);
@@ -393,10 +393,10 @@ static void new_bytes(GAtServer *p)
 			wrap = len;
 		}
 
-		if (result == PARSER_RESULT_UNSURE)
+		if (state == PARSER_RESULT_UNSURE)
 			continue;
 
-		switch (result) {
+		switch (state) {
 		case PARSER_RESULT_EMPTY_COMMAND:
 			/*
 			 * According to section 5.2.4 and 5.6 of V250,
-- 
1.6.6.1



More information about the ofono mailing list