All of lore.kernel.org
 help / color / mirror / Atom feed
From: Zhenhua Zhang <zhenhua.zhang@intel.com>
To: ofono@ofono.org
Subject: [PATCH 3/4] Update rename result to state
Date: Tue, 02 Mar 2010 18:21:38 +0800	[thread overview]
Message-ID: <1267525299-5740-3-git-send-email-zhenhua.zhang@intel.com> (raw)
In-Reply-To: <1267525299-5740-2-git-send-email-zhenhua.zhang@intel.com>

[-- Attachment #1: Type: text/plain, Size: 1213 bytes --]

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


  reply	other threads:[~2010-03-02 10:21 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-02 10:21 [PATCH 1/4] Add command echo back if ATE=1 Zhenhua Zhang
2010-03-02 10:21 ` [PATCH 2/4] Fix remove wrong extended prefix Zhenhua Zhang
2010-03-02 10:21   ` Zhenhua Zhang [this message]
2010-03-02 10:21     ` [PATCH 4/4] Fix server only return the final parser result Zhenhua Zhang
2010-03-03 19:09       ` Denis Kenzior
2010-03-04  1:31         ` Zhenhua Zhang
2010-03-03 19:07     ` [PATCH 3/4] Update rename result to state Denis Kenzior
2010-03-03 19:17   ` [PATCH 2/4] Fix remove wrong extended prefix Denis Kenzior
2010-03-04  1:38     ` Zhenhua Zhang
2010-03-03 19:02 ` [PATCH 1/4] Add command echo back if ATE=1 Denis Kenzior

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1267525299-5740-3-git-send-email-zhenhua.zhang@intel.com \
    --to=zhenhua.zhang@intel.com \
    --cc=ofono@ofono.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.