From: yoe <yoe>
Date: Thu, 21 Sep 2006 17:44:41 +0000 (+0000)
Subject: r185: Build/documentation fixes from Phillip Hellewell
X-Git-Url: http://git.alex.org.uk

r185: Build/documentation fixes from Phillip Hellewell
---

diff --git a/Makefile.am b/Makefile.am
index 1c8c837..2306635 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,6 @@ nbd_server_SOURCES = nbd-server.c cliserv.h
 nbd_tester_client_SOURCES = nbd-tester-client.c cliserv.h
 nbd_server_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
 nbd_tester_client_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
-nbd_tester_client_LDADD = @GLIB_LIBS@
 nbd_server_LDADD = @GLIB_LIBS@
 nbd_tester_client_LDADD = @GLIB_LIBS@
 man_MANS = nbd-server.1 nbd-client.8
diff --git a/nbd-client.8.sgml b/nbd-client.8.sgml
index 8e9f3c1..1c1e6ad 100644
--- a/nbd-client.8.sgml
+++ b/nbd-client.8.sgml
@@ -141,21 +141,21 @@ manpage.1: manpage.sgml
       <listitem>
 	<para>To connect to a server running on port 2000 at host
 	  "server.domain.com", using the client's block special file
-	  "/dev/nd0":</para>
+	  "/dev/nb0":</para>
 	<para><command>nbd-client server.domain.com 2000
-	  /dev/nd0</command></para>
+	  /dev/nb0</command></para>
       </listitem>
       <listitem>
 	<para>To connect to a server running on port 2001 at host
 	  "swapserver.domain.com", using the client's block special
-	  file "/dev/nd1", for swap purposes:</para>
-	<para><command>nbd-client swapserver.domain.com 2001 /dev/nd1
+	  file "/dev/nb1", for swap purposes:</para>
+	<para><command>nbd-client swapserver.domain.com 2001 /dev/nb1
 	  -swap</command></para>
       </listitem>
       <listitem>
 	<para>To disconnect the above connection again (after making
 	  sure the block special file is not in use anymore):</para>
-	<para><command>nbd-client -d /dev/nd1</command></para>
+	<para><command>nbd-client -d /dev/nb1</command></para>
       </listitem>
     </itemizedlist>
   </refsect1>
diff --git a/nbd-server.c b/nbd-server.c
index 41e453e..cadfb57 100644
--- a/nbd-server.c
+++ b/nbd-server.c
@@ -1130,7 +1130,7 @@ int serveloop(GArray* servers) {
 	int max;
 	int sock;
 	fd_set mset;
-	int rset;
+	fd_set rset;
 	struct timeval tv;
 
 	/*