Open Source Telephony
 help / color / mirror / Atom feed
From: Yang Gu <yang.gu@intel.com>
To: ofono@ofono.org
Subject: [PATCH 11/11] Handle the comprehension tlv with bad format in parse_dataobj()
Date: Wed, 31 Mar 2010 17:17:03 +0800	[thread overview]
Message-ID: <1270027023-21468-11-git-send-email-yang.gu@intel.com> (raw)
In-Reply-To: <1270027023-21468-10-git-send-email-yang.gu@intel.com>

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

---
 src/stkutil.c |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/stkutil.c b/src/stkutil.c
index b830291..937ef1a 100644
--- a/src/stkutil.c
+++ b/src/stkutil.c
@@ -910,7 +910,6 @@ static gboolean parse_dataobj(struct comprehension_tlv_iter *iter,
 	entries = g_slist_reverse(entries);
 
 	for (l = entries; l; l = l->next) {
-		gboolean ret;
 		dataobj_handler handler;
 		struct dataobj_handler_entry *entry = l->data;
 
@@ -918,15 +917,12 @@ static gboolean parse_dataobj(struct comprehension_tlv_iter *iter,
 		if (handler == NULL)
 			continue;
 
-		if (comprehension_tlv_iter_get_tag(iter) == entry->type)
-			ret = handler(iter, entry->data);
-		else
-			ret = FALSE;
-
-		entry->parsed = ret;
-
-		if (ret && comprehension_tlv_iter_next(iter) == FALSE)
-			break;
+		if (comprehension_tlv_iter_get_tag(iter) == entry->type) {
+			if (handler(iter, entry->data))
+				entry->parsed = TRUE;
+			if (comprehension_tlv_iter_next(iter) == FALSE)
+				break;
+		}
 	}
 
 	for (l = entries; l; l = l->next) {
-- 
1.6.3.3


  reply	other threads:[~2010-03-31  9:17 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-31  9:16 [PATCH 01/11] Adjust the sequence of comprehension tlv structures Yang Gu
2010-03-31  9:16 ` [PATCH 02/11] Add parser for items next action indicator objects Yang Gu
2010-03-31  9:16   ` [PATCH 03/11] Add parser for event list objects Yang Gu
2010-03-31  9:16     ` [PATCH 04/11] Add parser for cause objects Yang Gu
2010-03-31  9:16       ` [PATCH 05/11] Add parser for location status objects Yang Gu
2010-03-31  9:16         ` [PATCH 06/11] Add parser for transaction identifier objects Yang Gu
2010-03-31  9:16           ` [PATCH 07/11] Add parser for call control requested action objects Yang Gu
2010-03-31  9:17             ` [PATCH 08/11] Add enum for icon qualifier Yang Gu
2010-03-31  9:17               ` [PATCH 09/11] Add parser for item icon identifier list objects Yang Gu
2010-03-31  9:17                 ` [PATCH 10/11] Rename stk_icon_identifier to stk_icon_id Yang Gu
2010-03-31  9:17                   ` Yang Gu [this message]
2010-03-31 17:25 ` [PATCH 01/11] Adjust the sequence of comprehension tlv structures 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=1270027023-21468-11-git-send-email-yang.gu@intel.com \
    --to=yang.gu@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox