From: Kelley Nielsen <kelleynnn@gmail.com>
To: xen-devel@lists.xensource.com
Cc: anthony.perard@citrix.com, Ian.Campbell@citrix.com
Subject: [PATCH OPW 04/11] libxl: use GCSPRINTF instead of libxl__sprintf
Date: Mon, 11 Nov 2013 15:23:53 -0800 [thread overview]
Message-ID: <1384212240-1235-5-git-send-email-kelleynnn@gmail.com> (raw)
In-Reply-To: <1384212240-1235-1-git-send-email-kelleynnn@gmail.com>
Code cleanup - no functional changes
The convenience macro GCSPRINTF has been written to be used in place
of libxl__sprintf(). Replace all calls to libxl__sprintf() in
libxl_utils.c with invocations of the new macro.
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 | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c
index 682f874..53ebf73 100644
--- a/tools/libxl/libxl_utils.c
+++ b/tools/libxl/libxl_utils.c
@@ -173,8 +173,8 @@ int libxl_get_stubdom_id(libxl_ctx *ctx, int guest_domid)
int ret;
stubdom_id_s = libxl__xs_read(gc, XBT_NULL,
- libxl__sprintf(gc, "%s/image/device-model-domid",
- libxl__xs_get_dompath(gc, guest_domid)));
+ GCSPRINTF("%s/image/device-model-domid",
+ libxl__xs_get_dompath(gc, guest_domid)));
if (stubdom_id_s)
ret = atoi(stubdom_id_s);
else
@@ -190,7 +190,8 @@ int libxl_is_stubdom(libxl_ctx *ctx, uint32_t domid, uint32_t *target_domid)
uint32_t value;
int ret = 0;
- target = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/target", libxl__xs_get_dompath(gc, domid)));
+ target = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/target",
+ libxl__xs_get_dompath(gc, domid)));
if (!target)
goto out;
value = strtol(target, &endptr, 10);
@@ -227,20 +228,20 @@ int libxl_create_logfile(libxl_ctx *ctx, const char *name, char **full_name)
char *logfile, *logfile_new;
int i, rc;
- logfile = libxl__sprintf(gc, "/var/log/xen/%s.log", name);
+ logfile = GCSPRINTF("/var/log/xen/%s.log", name);
if (stat(logfile, &stat_buf) == 0) {
/* file exists, rotate */
- logfile = libxl__sprintf(gc, "/var/log/xen/%s.log.10", name);
+ logfile = GCSPRINTF("/var/log/xen/%s.log.10", name);
unlink(logfile);
for (i = 9; i > 0; i--) {
- logfile = libxl__sprintf(gc, "/var/log/xen/%s.log.%d", name, i);
- logfile_new = libxl__sprintf(gc, "/var/log/xen/%s.log.%d", name, i + 1);
+ logfile = GCSPRINTF("/var/log/xen/%s.log.%d", name, i);
+ logfile_new = GCSPRINTF("/var/log/xen/%s.log.%d", name, i + 1);
rc = logrename(gc, logfile, logfile_new);
if (rc)
goto out;
}
- logfile = libxl__sprintf(gc, "/var/log/xen/%s.log", name);
- logfile_new = libxl__sprintf(gc, "/var/log/xen/%s.log.1", name);
+ logfile = GCSPRINTF("/var/log/xen/%s.log", name);
+ logfile_new = GCSPRINTF("/var/log/xen/%s.log.1", name);
rc = logrename(gc, logfile, logfile_new);
if (rc)
--
1.8.1.2
next prev parent reply other threads:[~2013-11-11 23:23 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-11 23:23 [PATCH 0/11 OPW] All outstanding and corrected patches Kelley Nielsen
2013-11-11 23:23 ` [PATCH OPW 01/11] libxl: change most remaining LIBXL_LOG to LOG in libxl_qmp.c Kelley Nielsen
2013-11-14 14:00 ` Anthony PERARD
2013-11-11 23:23 ` [PATCH OPW 02/11] libxl: Use new macro LOGE() " Kelley Nielsen
2013-11-11 23:23 ` [PATCH OPW 03/11] libxl: use GCSPRINTF in place of libxl_sprintf() " Kelley Nielsen
2013-11-11 23:23 ` Kelley Nielsen [this message]
2013-11-11 23:23 ` [PATCH OPW 05/11] libxl: use LOGE instead of LIBXL__LOG_ERRNO in libxl_utils.c Kelley Nielsen
2013-11-14 14:29 ` Anthony PERARD
2013-11-11 23:23 ` [PATCH OPW 06/11] libxl: use LOG and LOGE instead of LIBXL__LOG* " Kelley Nielsen
2013-11-11 23:23 ` [PATCH OPW 07/11] libxl: use LOG instead of LIBXL__LOG " Kelley Nielsen
2013-11-11 23:23 ` [PATCH OPW 08/11] opw: libxl: add convenience macros to qmp_send() in libxl_qmp.c Kelley Nielsen
2013-11-11 23:23 ` [PATCH OPW 09/11] opw: libxl: use macro CTX " Kelley Nielsen
2013-11-11 23:23 ` [PATCH OPW 10/11] opw: libxl: use macro GCNEW " Kelley Nielsen
2013-11-11 23:24 ` [PATCH OPW 11/11] opw: libxl: use CTX macro in libxl_utils.c Kelley Nielsen
2013-11-12 17:26 ` [PATCH 0/11 OPW] All outstanding and corrected patches Matt Wilson
2013-11-19 14:29 ` Ian Campbell
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=1384212240-1235-5-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).