summaryrefslogtreecommitdiff
path: root/libshouldbeinlibc
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2014-01-28 23:43:09 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2014-01-28 23:43:09 +0100
commite24381784b0a56896542d1a5828a77ad0e1c40ec (patch)
tree493e0d6ad811f563142c5de72a8b80bb5d142b93 /libshouldbeinlibc
parent613f84a0fcd46f2143b046b57c6c6444eafa4d4d (diff)
parentb8c728ec51696c5d17ef09a00b3b193b70a487da (diff)
Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/hurd
Diffstat (limited to 'libshouldbeinlibc')
-rw-r--r--libshouldbeinlibc/wire.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libshouldbeinlibc/wire.c b/libshouldbeinlibc/wire.c
index b9540955..ca5d32b1 100644
--- a/libshouldbeinlibc/wire.c
+++ b/libshouldbeinlibc/wire.c
@@ -139,10 +139,10 @@ wire_segment (vm_address_t start,
vm_size_t len)
{
mach_port_t host, device;
- error_t error;
+ error_t err;
- error = get_privileged_ports (&host, &device);
- if (!error)
+ err = get_privileged_ports (&host, &device);
+ if (!err)
{
wire_segment_internal (start, len, host);
mach_port_deallocate (mach_task_self (), host);
@@ -158,11 +158,11 @@ wire_task_self ()
{
struct link_map *map;
mach_port_t host, device;
- error_t error;
+ error_t err;
extern char _edata, _etext, __data_start;
- error = get_privileged_ports (&host, &device);
- if (error)
+ err = get_privileged_ports (&host, &device);
+ if (err)
return;
map = loaded ();