match _dl_ syscall prototypes w/ the real syscalls prototypes, including args and return values; art@ ok

6 files changed, 42 insertions, 45 deletions

diff --git a/libexec/ld.so/alpha/syscall.h b/libexec/ld.so/alpha/syscall.h
index 9ca72fa02bf..fca8a65c397 100644
--- a/libexec/ld.so/alpha/syscall.h
+++ b/libexec/ld.so/alpha/syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.h,v 1.6 2002/07/12 20:18:30 drahn Exp $ */
+/*	$OpenBSD: syscall.h,v 1.7 2002/07/23 23:56:31 mickey Exp $ */
 
 /*
  * Copyright (c) 2001 Niklas Hallqvist
@@ -46,13 +46,13 @@
 int	_dl_close(int);
 int	_dl_exit(int);
 int	_dl_issetugid(void);
-long	_dl_mmap(void *, unsigned int, unsigned int, unsigned int, int, off_t);
-int	_dl_mprotect(const void *, int, int);
-int	_dl_munmap(const void*, unsigned int);
-int	_dl_open(const char*, unsigned int);
-int	_dl_read(int, const char*, int);
+void *	_dl_mmap(void *, size_t, int, int, int, off_t);
+int	_dl_mprotect(const void *, size_t, int);
+int	_dl_munmap(const void*, size_t);
+int	_dl_open(const char*, int);
+ssize_t	_dl_read(int, const char*, size_t);
 int	_dl_stat(const char *, struct stat *);
-int	_dl_write(int, const char*, int);
+ssize_t	_dl_write(int, const char*, size_t);
 int	_dl_fstat(int, struct stat *);
 int	_dl_fcntl(int, int, ...);
 int	_dl_getdirentries(int, char*, int, long *);
diff --git a/libexec/ld.so/library.c b/libexec/ld.so/library.c
index ec75bcd1b55..e6c6bc1386f 100644
--- a/libexec/ld.so/library.c
+++ b/libexec/ld.so/library.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: library.c,v 1.16 2002/07/12 20:18:30 drahn Exp $ */
+/*	$OpenBSD: library.c,v 1.17 2002/07/23 23:56:31 mickey Exp $ */
 
 /*
  * Copyright (c) 2002 Dale Rahn
@@ -426,7 +426,7 @@ _dl_tryload_shlib(const char *libname, int type)
 		if (phdp->p_type == PT_LOAD) {
 			char *start = (char *)(phdp->p_vaddr & ~align) + loff;
 			int size = (phdp->p_vaddr & align) + phdp->p_filesz;
-			int res;
+			void *res;
 
 			res = _dl_mmap(start, size, PFLAGS(phdp->p_flags),
 			    MAP_FIXED|MAP_PRIVATE, libfile,
diff --git a/libexec/ld.so/mips/syscall.h b/libexec/ld.so/mips/syscall.h
index 896fd7efe67..0437d269c34 100644
--- a/libexec/ld.so/mips/syscall.h
+++ b/libexec/ld.so/mips/syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.h,v 1.6 2002/07/12 20:18:30 drahn Exp $ */
+/*	$OpenBSD: syscall.h,v 1.7 2002/07/23 23:56:31 mickey Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -65,7 +65,7 @@ _dl_exit (int status)
 }
 
 extern inline int
-_dl_open (const char* addr, unsigned int flags)
+_dl_open (const char* addr, int flags)
 {
 	register int status __asm__ ("$2");
 
@@ -99,10 +99,10 @@ _dl_close (int fd)
 	return status;
 }
 
-extern inline int
-_dl_write (int fd, const char* buf, int len)
+extern inline ssize_t
+_dl_write (int fd, const char* buf, size_t len)
 {
-	register int status __asm__ ("$2");
+	register ssize_t status __asm__ ("$2");
 
 	__asm__ volatile ("move  $4,%2\n\t"
 	    "move  $5,%3\n\t"
@@ -118,10 +118,10 @@ _dl_write (int fd, const char* buf, int len)
 	return status;
 }
 
-extern inline int
-_dl_read (int fd, const char* buf, int len)
+extern inline ssize_t
+_dl_read (int fd, const char* buf, size_t len)
 {
-	register int status __asm__ ("$2");
+	register ssize_t status __asm__ ("$2");
 
 	__asm__ volatile ("move  $4,%2\n\t"
 	    "move  $5,%3\n\t"
@@ -137,11 +137,10 @@ _dl_read (int fd, const char* buf, int len)
 	return status;
 }
 
-extern inline int
-_dl_mmap (void *addr, unsigned int size, unsigned int prot,
-    unsigned int flags, int fd, unsigned int f_offset)
+extern inline void *
+_dl_mmap (void *addr, size_t size, int prot, int flags, int fd, off_t f_offset)
 {
-	register int malloc_buffer __asm__ ("$2");
+	register void * malloc_buffer __asm__ ("$2");
 
 	__asm__ volatile ("addiu $29,-40\n\t"
 	    "move  $6,%2\n\t"
@@ -175,7 +174,7 @@ _dl_mmap (void *addr, unsigned int size, unsigned int prot,
 }
 
 extern inline int
-_dl_munmap (const void* addr, unsigned int len)
+_dl_munmap (const void* addr, size_t len)
 {
 	register int status __asm__ ("$2");
 
@@ -193,7 +192,7 @@ _dl_munmap (const void* addr, unsigned int len)
 }
 
 extern inline int
-_dl_mprotect (const void *addr, int size, int prot)
+_dl_mprotect (const void *addr, size_t size, int prot)
 {
 	register int status __asm__ ("$2");
 
diff --git a/libexec/ld.so/powerpc/syscall.h b/libexec/ld.so/powerpc/syscall.h
index fd5f5b2ae73..25b47f947db 100644
--- a/libexec/ld.so/powerpc/syscall.h
+++ b/libexec/ld.so/powerpc/syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.h,v 1.9 2002/07/12 20:18:30 drahn Exp $ */
+/*	$OpenBSD: syscall.h,v 1.10 2002/07/23 23:56:31 mickey Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -68,7 +68,7 @@ _dl_exit (int status)
 }
 
 static inline int
-_dl_open (const char* addr, unsigned int flags)
+_dl_open (const char* addr, int flags)
 {
 	register int status __asm__ ("3");
 
@@ -104,10 +104,10 @@ _dl_close (int fd)
 	return status;
 }
 
-static inline int
-_dl_write (int fd, const char* buf, int len)
+static inline ssize_t
+_dl_write (int fd, const char* buf, size_t len)
 {
-	register int status __asm__ ("3");
+	register ssize_t status __asm__ ("3");
 
 	__asm__ volatile ("mr    0,%1\n\t"
 	    "mr    3,%2\n\t"
@@ -124,10 +124,10 @@ _dl_write (int fd, const char* buf, int len)
 	return status;
 }
 
-static inline int
-_dl_read (int fd, const char* buf, int len)
+static inline ssize_t
+_dl_read (int fd, const char* buf, size_t len)
 {
-	register int status __asm__ ("3");
+	register ssize_t status __asm__ ("3");
 
 	__asm__ volatile ("mr    0,%1\n\t"
 	    "mr    3,%2\n\t"
@@ -158,16 +158,15 @@ __asm__(".align 2\n\t"
 	"1:\n\t"
 	"blr");
 
-static inline int
-_dl_mmap (void *addr, unsigned int len, unsigned int prot,
-    unsigned int flags, int fd, off_t offset)
+static inline void *
+_dl_mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset)
 {
-	return((int)_dl__syscall((quad_t)SYS_mmap, addr, len, prot,
+	return((void *)_dl__syscall((quad_t)SYS_mmap, addr, len, prot,
 	    flags, fd, 0, offset));
 }
 
 static inline int
-_dl_munmap (const void* addr, unsigned int len)
+_dl_munmap (const void* addr, size_t len)
 {
 	register int status __asm__ ("3");
 
@@ -186,7 +185,7 @@ _dl_munmap (const void* addr, unsigned int len)
 }
 
 static inline int
-_dl_mprotect (const void *addr, int size, int prot)
+_dl_mprotect (const void *addr, size_t size, int prot)
 {
 	register int status __asm__ ("3");
 
diff --git a/libexec/ld.so/sparc64/syscall.h b/libexec/ld.so/sparc64/syscall.h
index 045b15e1bcc..685f010e177 100644
--- a/libexec/ld.so/sparc64/syscall.h
+++ b/libexec/ld.so/sparc64/syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.h,v 1.6 2002/07/12 20:18:30 drahn Exp $ */
+/*	$OpenBSD: syscall.h,v 1.7 2002/07/23 23:56:31 mickey Exp $ */
 
 /*
  * Copyright (c) 2001 Niklas Hallqvist
@@ -48,12 +48,12 @@ int	_dl_close(int);
 int	_dl_exit(int);
 int	_dl_issetugid(void);
 long	_dl__syscall(quad_t, ...);
-int	_dl_mprotect(const void *, int, int);
-int	_dl_munmap(const void*, unsigned int);
-int	_dl_open(const char*, unsigned int);
-int	_dl_read(int, const char*, int);
+int	_dl_mprotect(const void *, size_t, int);
+int	_dl_munmap(const void*, size_t);
+int	_dl_open(const char*, int);
+ssize_t	_dl_read(int, const char*, size_t);
 int	_dl_stat(const char *, struct stat *);
-int	_dl_write(int, const char*, int);
+ssize_t	_dl_write(int, const char*, size_t);
 int	_dl_fstat(int, struct stat *);
 int	_dl_fcntl(int, int, ...);
 int	_dl_getdirentries(int, char*, int, long *);
diff --git a/libexec/ld.so/util.h b/libexec/ld.so/util.h
index ec17a8a3877..78e4de225ca 100644
--- a/libexec/ld.so/util.h
+++ b/libexec/ld.so/util.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.h,v 1.6 2002/05/28 00:23:57 deraadt Exp $	*/
+/*	$OpenBSD: util.h,v 1.7 2002/07/23 23:56:31 mickey Exp $	*/
 
 /*
  * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -36,7 +36,6 @@
 
 #ifndef __DL_UTIL_H__
 #define __DL_UTIL_H__
-int _dl_write(int, const char *, int);
 void *_dl_malloc(const int size);
 void _dl_free(void *);
 char *_dl_strdup(const char *);