[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Libguestfs] [PATCH] guestfs: fix typo in my recent change



Sorry about that.
Matt noticed I introduced a compilation failure.
Here's what I've pushed.

>From ad7818c34d4d6ef6b0959ef7dbbf006968166030 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering redhat com>
Date: Mon, 3 Aug 2009 15:39:09 +0200
Subject: [PATCH] guestfs: fix typo in my recent change

* src/guestfs.c (guestfs_perrorf): Rename former err to errnum,
to avoid compilation error.
---
 src/guestfs.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/guestfs.c b/src/guestfs.c
index 802c1d2..40e702e 100644
--- a/src/guestfs.c
+++ b/src/guestfs.c
@@ -440,7 +440,7 @@ guestfs_perrorf (guestfs_h *g, const char *fs, ...)
 {
   va_list args;
   char *msg;
-  int err = errno;
+  int errnum = errno;

   va_start (args, fs);
   int err = vasprintf (&msg, fs, args);
@@ -450,11 +450,11 @@ guestfs_perrorf (guestfs_h *g, const char *fs, ...)

 #ifndef _GNU_SOURCE
   char buf[256];
-  strerror_r (err, buf, sizeof buf);
+  strerror_r (errnum, buf, sizeof buf);
 #else
   char _buf[256];
   char *buf;
-  buf = strerror_r (err, _buf, sizeof _buf);
+  buf = strerror_r (errnum, _buf, sizeof _buf);
 #endif

   msg = safe_realloc (g, msg, strlen (msg) + 2 + strlen (buf) + 1);
--
1.6.4.212.g4719


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]