WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] [PATCH 03 of 45] gcc-4.6 compile fix: tools/xenstore/xenstor

To: xen-devel@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-devel] [PATCH 03 of 45] gcc-4.6 compile fix: tools/xenstore/xenstored_core.c
From: Olaf Hering <olaf@xxxxxxxxx>
Date: Thu, 19 May 2011 21:05:22 +0200
Delivery-date: Thu, 19 May 2011 12:09:38 -0700
Dkim-signature: v=1; a=rsa-sha1; c=relaxed/relaxed; t=1305831976; l=1867; s=domk; d=aepfle.de; h=To:From:Date:References:In-Reply-To:Subject: Content-Transfer-Encoding:MIME-Version:Content-Type:X-RZG-CLASS-ID: X-RZG-AUTH; bh=ZFW1kCDrjb6mSReP53Vcj4jXLnI=; b=t0sI/kd3bq5OHustIJBVJwz7G4/ow5JUbkG8lbBb4VwdkEAO4vCQ97E+JRiFDlt2FHb dzfaBT5xHLTo/3MfPLqmwwLrpjSTPb1rwC5X3OTXVnvEXhEPb641v4EQMxy6M4ofpHJvJ tuFmsDFSNuWasP0ZQWVaGh5pV7SpJ6q4jiA=
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <patchbomb.1305831919@xxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
References: <patchbomb.1305831919@xxxxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mercurial-patchbomb/1.7.5
# HG changeset patch
# User Olaf Hering <olaf@xxxxxxxxx>
# Date 1305824384 -7200
# Node ID cb0ed92e451d06789cb1a0ba14967bda3a7a5bcb
# Parent  9c492ce99bbe24e1b4bbe43c754f136ac19a372f
gcc-4.6 compile fix: tools/xenstore/xenstored_core.c

xenstored_core.c: In function 'trace':
xenstored_core.c:133:11: error: variable 'dummy' set but not used 
[-Werror=unused-but-set-variable]
xenstored_core.c: In function 'trigger_reopen_log':
xenstored_core.c:203:6: error: variable 'dummy' set but not used 
[-Werror=unused-but-set-variable]

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>

diff -r 9c492ce99bbe -r cb0ed92e451d tools/xenstore/xenstored_core.c
--- a/tools/xenstore/xenstored_core.c   Thu May 19 18:59:42 2011 +0200
+++ b/tools/xenstore/xenstored_core.c   Thu May 19 18:59:44 2011 +0200
@@ -130,7 +130,7 @@ void trace(const char *fmt, ...)
        va_list arglist;
        char *str;
        char sbuf[1024];
-       int ret, dummy;
+       int ret;
 
        if (tracefd < 0)
                return;
@@ -141,7 +141,10 @@ void trace(const char *fmt, ...)
        va_end(arglist);
 
        if (ret <= 1024) {
-               dummy = write(tracefd, sbuf, ret);
+               if (write(tracefd, sbuf, ret) < 0) {
+                       close(tracefd);
+                       tracefd = -1;
+               }
                return;
        }
 
@@ -149,7 +152,10 @@ void trace(const char *fmt, ...)
        va_start(arglist, fmt);
        str = talloc_vasprintf(NULL, fmt, arglist);
        va_end(arglist);
-       dummy = write(tracefd, str, strlen(str));
+       if (write(tracefd, str, strlen(str)) < 0) {
+               close(tracefd);
+               tracefd = -1;
+       }
        talloc_free(str);
 }
 
@@ -200,8 +206,12 @@ void trace_destroy(const void *data, con
 static void trigger_reopen_log(int signal __attribute__((unused)))
 {
        char c = 'A';
-       int dummy;
-       dummy = write(reopen_log_pipe[1], &c, 1);
+       if (reopen_log_pipe[1] < 0)
+               return;
+       if (write(reopen_log_pipe[1], &c, 1) < 0) {
+               close(reopen_log_pipe[1]);
+               reopen_log_pipe[1] = -1;
+       }
 }
 
 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel