X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils%2Fshowmount%2Fshowmount.c;h=76bef19b95a21d30a133032eb0267dca9760590b;hb=1d61a1116198714f50b081daecc663625124403d;hp=f3ac671c9308f08df356226c6fda10596db6eccd;hpb=66d8e2870b8d3e91c27a66ebc85e012a3cda9c69;p=nfs-utils.git

diff --git a/utils/showmount/showmount.c b/utils/showmount/showmount.c
index f3ac671..76bef19 100644
--- a/utils/showmount/showmount.c
+++ b/utils/showmount/showmount.c
@@ -62,16 +62,14 @@ static struct option longopts[] =
 
 #define MAXHOSTLEN 256
 
-int dump_cmp(p, q)
-char **p;
-char **q;
+static int dump_cmp(const void *pv, const void *qv)
 {
+	const char **p = (const char **)pv;
+	const char **q = (const char **)qv;
 	return strcmp(*p, *q);
 }
 
-static void usage(fp, n)
-FILE *fp;
-int n;
+static void usage(FILE *fp, int n)
 {
 	fprintf(fp, "Usage: %s [-adehv]\n", program_name);
 	fprintf(fp, "       [--all] [--directories] [--exports]\n");
@@ -242,6 +240,8 @@ static unsigned short getport(struct sockaddr_in *addr,
 		rpc_createerr.cf_stat = status;
 		clnt_destroy(client);
 		return 0;
+	} else if (port == 0) {
+		rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED;
 	}
 
 	clnt_destroy(client);
@@ -249,9 +249,7 @@ static unsigned short getport(struct sockaddr_in *addr,
 	return htons(port);
 }
 
-int main(argc, argv)
-int argc;
-char **argv;
+int main(int argc, char **argv)
 {
 	char hostname_buf[MAXHOSTLEN];
 	char *hostname;
@@ -368,7 +366,7 @@ char **argv;
 		server_addr.sin_port = getport(&server_addr,
 					 MOUNTPROG, MOUNTVERS, IPPROTO_UDP);
 		if (!server_addr.sin_port) {
-			clnt_pcreateerror("portmap getport");
+			clnt_pcreateerror("showmount");
 			exit(1);
 		}
 		msock = RPC_ANYSOCK;