From: Stephen North <north@research.att.com>
Date: Wed, 13 Feb 2013 03:39:48 +0000 (-0500)
Subject: I fixed my fix using poll()
X-Git-Tag: LAST_LIBGRAPH~32^2~237
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ed263e89da23b6189f6cb64031b2e3c1a4be610;p=graphviz

I fixed my fix using poll()
---

diff --git a/lib/common/htmltable.c b/lib/common/htmltable.c
index 1b5663922..49dc2cac3 100644
--- a/lib/common/htmltable.c
+++ b/lib/common/htmltable.c
@@ -1386,8 +1386,8 @@ void makeGraphs(htmltbl_t * tbl, graph_t * rowg, graph_t * colg)
 	ED_minlen(e) = x;
 	/* ED_minlen(e) = cp->data.box.UR.x; */
 #if (DEBUG==2)
-	fprintf(stderr, "col edge %s -> %s %d\n", t->name, h->name,
-		ED_minlen(e));
+	fprintf(stderr, "col edge %s ", agnameof(t));
+	fprintf(stderr, "-> %s %d\n", agnameof(h), ED_minlen(e));
 #endif
 	elist_append(e, ND_out(t));
 	elist_append(e, ND_in(h));
diff --git a/plugin/xlib/gvdevice_xlib.c b/plugin/xlib/gvdevice_xlib.c
index bf288942f..417f3e128 100644
--- a/plugin/xlib/gvdevice_xlib.c
+++ b/plugin/xlib/gvdevice_xlib.c
@@ -390,7 +390,7 @@ static int handle_stdin_events(GVJ_t *job, int stdin_fd)
     ufds[0].events = POLLIN;
 	ufds[0].revents = 0;
     r = poll(ufds,1,0);
-	if (ufds[0].revents == POLLIN) return -1;
+	if (ufds[0].revents & POLLIN) return -1;
 	/* Beware of bugs in the above code; I have only proved it correct, not tried it. */
 #endif
     (job->callbacks->read)(job, job->input_filename, job->layout_type);