From: Kelley Nielsen <kelleynnn@gmail.com>
To: xen-devel@lists.xensource.com
Cc: anthony.perard@citrix.com, Ian.Campbell@citrix.com
Subject: [PATCH OPW 7/7] libxl: use LOG instead of LIBXL__LOG in libxl_utils.c
Date: Mon, 11 Nov 2013 07:50:14 -0800 [thread overview]
Message-ID: <1384185014-30342-8-git-send-email-kelleynnn@gmail.com> (raw)
In-Reply-To: <1384185014-30342-1-git-send-email-kelleynnn@gmail.com>
To conform to the new coding style, replace the invocation of
LIBXL__LOG in the function libxl_pipe() in the file libxl_utils.c
with an invocation of LOG. Create a local libxl__gc gc* for LOG
to use by invoking GC_INIT(ctx) at the top of the function, and
clean it up by invoking GC_FREE at the exit. Create a variable,
ret, to consolidate exits in one place and avoid invoking GC_FREE
twice.
Suggested-by: Ian Campbell <Ian.Campbell@citrix.com>
Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
tools/libxl/libxl_utils.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c
index 5ed9e1b..4c5f754 100644
--- a/tools/libxl/libxl_utils.c
+++ b/tools/libxl/libxl_utils.c
@@ -477,11 +477,14 @@ int libxl__remove_directory(libxl__gc *gc, const char *dirpath)
int libxl_pipe(libxl_ctx *ctx, int pipes[2])
{
+ GC_INIT(ctx);
+ int ret = 0;
if (pipe(pipes) < 0) {
- LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Failed to create a pipe");
- return -1;
+ LOG(ERROR, "Failed to create a pipe");
+ ret = -1;
}
- return 0;
+ GC_FREE;
+ return ret;
}
int libxl_uuid_to_device_vtpm(libxl_ctx *ctx, uint32_t domid,
--
1.8.1.2
prev parent reply other threads:[~2013-11-11 15:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-11 15:50 [PATCH OPW 0/0] Resend of macro coding style fixes needing reindents Kelley Nielsen
2013-11-11 15:50 ` [PATCH OPW 1/7] libxl: Use new macro LOGE() in libxl_qmp.c Kelley Nielsen
2013-11-11 16:56 ` Ian Campbell
2013-11-11 15:50 ` [PATCH OPW 2/7] libxl: replace last invocation of LIBXL__LOG_ERROR with LOGE Kelley Nielsen
2013-11-11 15:50 ` [PATCH OPW 3/7] libxl: use GCSPRINTF in place of libxl_sprintf() in libxl_qmp.c Kelley Nielsen
2013-11-11 16:58 ` Ian Campbell
2013-11-11 15:50 ` [PATCH OPW 4/7] libxl: use GCSPRINTF instead of libxl__sprintf Kelley Nielsen
2013-11-11 15:50 ` [PATCH OPW 5/7] libxl: use LOGE instead of LIBXL__LOG_ERRNO in libxl_utils.c Kelley Nielsen
2013-11-11 15:50 ` [PATCH OPW 6/7] libxl: use LOG and LOGE instead of LIBXL__LOG* " Kelley Nielsen
2013-11-11 15:50 ` Kelley Nielsen [this message]
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=1384185014-30342-8-git-send-email-kelleynnn@gmail.com \
--to=kelleynnn@gmail.com \
--cc=Ian.Campbell@citrix.com \
--cc=anthony.perard@citrix.com \
--cc=xen-devel@lists.xensource.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;
as well as URLs for NNTP newsgroup(s).