From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kelley Nielsen Subject: [PATCH OPW 5/7] libxl: use LOGE instead of LIBXL__LOG_ERRNO in libxl_utils.c Date: Mon, 11 Nov 2013 07:50:12 -0800 Message-ID: <1384185014-30342-6-git-send-email-kelleynnn@gmail.com> References: <1384185014-30342-1-git-send-email-kelleynnn@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1384185014-30342-1-git-send-email-kelleynnn@gmail.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xensource.com Cc: anthony.perard@citrix.com, Ian.Campbell@citrix.com List-Id: xen-devel@lists.xenproject.org Code cleanup - no functional changes The convenience macro LOGE has been written to take the place of LIBXL__LOG_ERRNO. LOGE depends on the existence of a local libgl__gc *gc. Replace two invocations of LIBXL__LOG_ERRNO, which are in functions that already have a libxl__gc *gc present, to invocations of the new macro. Suggested-by: Ian Campbell Signed-off-by: Kelley Nielsen --- tools/libxl/libxl_utils.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 509d648..03ba6d8 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -206,15 +206,14 @@ out: static int logrename(libxl__gc *gc, const char *old, const char *new) { - libxl_ctx *ctx = libxl__gc_owner(gc); int r; r = rename(old, new); if (r) { if (errno == ENOENT) return 0; /* ok */ - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "failed to rotate logfile - could not" - " rename %s to %s", old, new); + LOGE(ERROR, "failed to rotate logfile - " + "could not rename %s to %s", old, new); return ERROR_FAIL; } return 0; @@ -247,9 +246,9 @@ int libxl_create_logfile(libxl_ctx *ctx, const char *name, char **full_name) goto out; } else { if (errno != ENOENT) - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_WARNING, "problem checking existence of" - " logfile %s, which might have needed to be rotated", - name); + LOGE(WARN, "problem checking existence of logfile %s, " + "which might have needed to be rotated", + name); } *full_name = strdup(logfile); rc = 0; -- 1.8.1.2