From: nils.carlson@ericsson.com (Nils Carlson)
Subject: [ltt-dev] [UST PATCH] Correct error handling and add error message in ustcmd.c
Date: Fri, 10 Sep 2010 13:30:57 +0200 [thread overview]
Message-ID: <1284118257-21055-1-git-send-email-nils.carlson@ericsson.com> (raw)
Signed-off-by: Nils Carlson <nils.carlson at ericsson.com>
---
libustcmd/ustcmd.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/libustcmd/ustcmd.c b/libustcmd/ustcmd.c
index 4248072..c512320 100644
--- a/libustcmd/ustcmd.c
+++ b/libustcmd/ustcmd.c
@@ -396,10 +396,6 @@ int ustcmd_get_cmsf(struct marker_status **cmsf, const pid_t pid)
}
result = ustcmd_send_cmd("list_markers", pid, &big_str);
if (result != 1) {
- return -1;
- }
-
- if (result != 1) {
ERR("error while getting markers list");
return -1;
}
@@ -407,6 +403,7 @@ int ustcmd_get_cmsf(struct marker_status **cmsf, const pid_t pid)
tmp_cmsf = (struct marker_status *) malloc(sizeof(struct marker_status) *
(ustcmd_count_nl(big_str) + 1));
if (tmp_cmsf == NULL) {
+ ERR("Failed to allocate CMSF array");
return -1;
}
--
1.7.1
next reply other threads:[~2010-09-10 11:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-10 11:30 Nils Carlson [this message]
2010-09-11 15:00 ` Mathieu Desnoyers
2010-09-11 16:01 ` David Goulet
2010-09-11 18:35 ` Nils Carlson
2010-09-11 18:48 ` Douglas Santos
2010-09-13 12:33 ` Nils Carlson
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=1284118257-21055-1-git-send-email-nils.carlson@ericsson.com \
--to=nils.carlson@ericsson.com \
/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