Make Windows pioctl prototypes consistent with Unix

The Windows pioctl prototypes differed from those now exported
by sys/sys_prototypes.h.  This produced undesirable warnings.

LICENSE MIT

Reviewed-on: http://gerrit.openafs.org/260
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>

diff --git a/src/sys/pioctl_nt.c b/src/sys/pioctl_nt.c
index 76d7cbff4b5baab25504e84f28ff733b9f3eeec6..db2acf3bd4116465aed7327b6e1cc30df73d6674 100644 (file)
--- a/src/sys/pioctl_nt.c
+++ b/src/sys/pioctl_nt.c
@@ -1186,8 +1186,8 @@ fs_GetFullPath(char *pathp, char *outPathp, long outSize)
     return 0;
 }
 
-static long
-pioctl_int(char *pathp, long opcode, struct ViceIoctl *blobp, int follow, int is_utf8)
+static int
+pioctl_int(char *pathp, afs_int32 opcode, struct ViceIoctl *blobp, afs_int32 follow, afs_int32 is_utf8)
 {
     fs_ioctlRequest_t preq;
     long code;
@@ -1274,14 +1274,14 @@ pioctl_int(char *pathp, long opcode, struct ViceIoctl *blobp, int follow, int is
     return 0;
 }
 
-long
-pioctl_utf8(char * pathp, long opcode, struct ViceIoctl * blobp, int follow)
+int
+pioctl_utf8(char * pathp, afs_int32 opcode, struct ViceIoctl * blobp, afs_int32 follow)
 {
     return pioctl_int(pathp, opcode, blobp, follow, TRUE);
 }
 
-long
-pioctl(char * pathp, long opcode, struct ViceIoctl * blobp, int follow)
+int
+pioctl(char * pathp, afs_int32 opcode, struct ViceIoctl * blobp, afs_int32 follow)
 {
     return pioctl_int(pathp, opcode, blobp, follow, FALSE);
 }

diff --git a/src/sys/pioctl_nt.h b/src/sys/pioctl_nt.h
index d84cfe75e6aa10d50e51d2f50ac324a55af1e004..2bbb074d65fec30f874c77edfeeea1f71f2ec3ef 100644 (file)
--- a/src/sys/pioctl_nt.h
+++ b/src/sys/pioctl_nt.h
@@ -25,10 +25,10 @@ typedef struct ViceIoctl {
 /* Fake error code since NT errno.h doesn't define it */
 #include <afs/errmap_nt.h>
 
-extern long pioctl(char *pathp, long opcode, struct ViceIoctl *blob,
-                  int follow);
+extern int pioctl(char *pathp, afs_int32 opcode, struct ViceIoctl *blob,
+                 afs_int32 follow);
 
-extern long pioctl_utf8(char *pathp, long opcode, struct ViceIoctl *blob,
-                        int follow);
+extern int pioctl_utf8(char *pathp, afs_int32 opcode, struct ViceIoctl *blob,
+                       afs_int32 follow);
 
 #endif /* OPENAFS_AFS_PIOCTL_H */