Fix a few compile-time warnings.

Still doesn't work on Alpha.
This commit is contained in:
hubertf 2000-09-24 15:16:40 +00:00
parent 1a35fe7612
commit b12a8cbb62
2 changed files with 47 additions and 8 deletions

View file

@ -1,5 +1,5 @@
$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:03 agc Exp $
$NetBSD: patch-sum,v 1.2 2000/09/24 15:16:40 hubertf Exp $
MD5 (patch-aa) = 619b08e8a17bf8c9d2d8bf138da72b30
MD5 (patch-ab) = 4d158c89e16c000ad4bfdafbc4c14a86
MD5 (patch-ac) = b1fc228cb246c469baedcca3de981bd0
MD5 (patch-ac) = a36bc201607543163d97a60c0c5d6ec4

View file

@ -1,8 +1,16 @@
$NetBSD: patch-ac,v 1.2 1998/11/12 23:48:35 frueauf Exp $
$NetBSD: patch-ac,v 1.3 2000/09/24 15:16:40 hubertf Exp $
--- nfsbug.c.orig Mon Sep 28 17:45:40 1998
+++ nfsbug.c Mon Sep 28 17:47:58 1998
@@ -25,16 +25,18 @@
--- nfsbug.c.orig Fri Feb 17 00:57:27 1995
+++ nfsbug.c
@@ -14,6 +14,7 @@
* - close sockets (?)
*/
#include <stdio.h>
+#include <string.h>
#include <ctype.h>
#include <netdb.h>
#include <errno.h>
@@ -25,18 +26,20 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
@ -20,7 +28,38 @@ $NetBSD: patch-ac,v 1.2 1998/11/12 23:48:35 frueauf Exp $
+#include <ufs/ufs/dinode.h>
+#else
#include <ufs/inode.h>
#endif
#endif
+#endif
#endif
#endif
#include "mount.h"
#include "nfs_prot.h"
@@ -105,8 +108,10 @@
/*
* File system types, these correspond to entries in fsconf
*/
+#ifndef __NetBSD__
#define MOUNT_UFS 1
#define MOUNT_NFS 2
+#endif /* __NetBSD__ */
#define MOUNT_PC 3
#define MOUNT_LO 4
#define MOUNT_TFS 5
@@ -240,7 +245,7 @@
} else
proto = "TCP/IP";
- clnt_control(mntclient, CLSET_TIMEOUT, &timeout);
+ clnt_control(mntclient, CLSET_TIMEOUT, (char *)&timeout);
mntclient->cl_auth = create_unix_auth(0, 0);
if (mntclient->cl_auth == NULL) {
clnt_destroy(mntclient);
@@ -277,7 +282,7 @@
} else
proto = "TCP/IP";
- clnt_control(nfsclient, CLSET_TIMEOUT, &timeout);
+ clnt_control(nfsclient, CLSET_TIMEOUT, (char *)&timeout);
nfsclient->cl_auth = create_unix_auth(-2, -2); /* well known uid, gid */
if (nfsclient->cl_auth == NULL) {
clnt_destroy(nfsclient);