diff options
Diffstat (limited to 'hurd')
| -rw-r--r-- | hurd/hurdauth.c | 16 | ||||
| -rw-r--r-- | hurd/hurdmsg.c | 2 | ||||
| -rw-r--r-- | hurd/hurdprio.c | 2 | ||||
| -rw-r--r-- | hurd/path-lookup.c | 2 | ||||
| -rw-r--r-- | hurd/siginfo.c | 3 | ||||
| -rw-r--r-- | hurd/xattr.c | 6 |
6 files changed, 16 insertions, 15 deletions
diff --git a/hurd/hurdauth.c b/hurd/hurdauth.c index ad315a27b7..1a7e67ea0e 100644 --- a/hurd/hurdauth.c +++ b/hurd/hurdauth.c @@ -52,8 +52,8 @@ _S_msg_add_auth (mach_port_t me, int i, j, k; vm_size_t offset; - urp = vm_allocate (mach_task_self (), (vm_address_t *) newlistp, - nexist + nnew * sizeof (uid_t), 1); + urp = __vm_allocate (mach_task_self (), (vm_address_t *) newlistp, + nexist + nnew * sizeof (uid_t), 1); if (urp) return urp; @@ -75,10 +75,10 @@ _S_msg_add_auth (mach_port_t me, offset = (round_page (nexist + nnew * sizeof (uid_t)) - round_page (j * sizeof (uid_t))); if (offset) - vm_deallocate (mach_task_self (), - (vm_address_t) (*newlistp - + (nexist + nnew * sizeof (uid_t))), - offset); + __vm_deallocate (mach_task_self (), + (vm_address_t) (*newlistp + + (nexist + nnew * sizeof (uid_t))), + offset); *newlistlen = j; return 0; } @@ -136,8 +136,8 @@ _S_msg_add_auth (mach_port_t me, #define freeup(array, len) \ if (array) \ - vm_deallocate (mach_task_self (), (vm_address_t) array, \ - len * sizeof (uid_t)); + __vm_deallocate (mach_task_self (), (vm_address_t) array, \ + len * sizeof (uid_t)); freeup (genuids, ngenuids); freeup (auxuids, nauxuids); diff --git a/hurd/hurdmsg.c b/hurd/hurdmsg.c index 5759af3411..63e5e81b87 100644 --- a/hurd/hurdmsg.c +++ b/hurd/hurdmsg.c @@ -344,7 +344,7 @@ _S_msg_set_env_variable (mach_port_t msgport, mach_port_t auth, { AUTHCHECK; - if (setenv (variable, value, replace)) /* XXX name space */ + if (__setenv (variable, value, replace)) /* XXX name space */ return errno; return 0; } diff --git a/hurd/hurdprio.c b/hurd/hurdprio.c index 5ff84b6f56..3783fe9397 100644 --- a/hurd/hurdprio.c +++ b/hurd/hurdprio.c @@ -50,7 +50,7 @@ _hurd_priority_which_map (enum __priority_which which, int who, case PRIO_USER: if (who == 0) - who = geteuid (); + who = __geteuid (); err = __USEPORT (PROC, __proc_getallpids (port, &pids, &npids)); for (i = 0; !err && i < npids; ++i) { diff --git a/hurd/path-lookup.c b/hurd/path-lookup.c index d3906e1c9b..389a8ccd1b 100644 --- a/hurd/path-lookup.c +++ b/hurd/path-lookup.c @@ -63,7 +63,7 @@ file_name_path_scan (const char *file_name, const char *path, if (err == 0) { if (prefixed_name) - *prefixed_name = strdup (pfxed_name); + *prefixed_name = __strdup (pfxed_name); return 0; } if (!real_err && err != ENOENT) diff --git a/hurd/siginfo.c b/hurd/siginfo.c index 65d8e4882e..75e02d5282 100644 --- a/hurd/siginfo.c +++ b/hurd/siginfo.c @@ -17,10 +17,11 @@ #include <hurd/signal.h> #include <stdio.h> +#include <libioP.h> void _hurd_siginfo_handler (int signo) { /* XXX */ - puts ("got a SIGINFO"); + _IO_puts ("got a SIGINFO"); } diff --git a/hurd/xattr.c b/hurd/xattr.c index c56bab07cb..23d9fcb691 100644 --- a/hurd/xattr.c +++ b/hurd/xattr.c @@ -67,14 +67,14 @@ _hurd_xattr_get (io_t port, const char *name, void *value, size_t *size) if (value != NULL && *size < bufsz) { if (buf != value) - munmap (buf, bufsz); + __munmap (buf, bufsz); return -ERANGE; } if (buf != value && bufsz > 0) { if (value != NULL) memcpy (value, buf, bufsz); - munmap (buf, bufsz); + __munmap (buf, bufsz); } *size = bufsz; return 0; @@ -150,7 +150,7 @@ _hurd_xattr_set (io_t port, const char *name, const void *value, size_t size, return err; if (bufsz > 0) { - munmap (buf, bufsz); + __munmap (buf, bufsz); return ENODATA; } } |