diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
commit | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch) | |
tree | 1e1463b03838a6f36868a4dafc7e652358a51857 /pfinet/main.c | |
parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'pfinet/main.c')
-rw-r--r-- | pfinet/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pfinet/main.c b/pfinet/main.c index c1e080a6..1357b037 100644 --- a/pfinet/main.c +++ b/pfinet/main.c @@ -288,7 +288,7 @@ main (int argc, /* Parse options. When successful, this configures the interfaces before returning; to do so, it will acquire the global_lock. - (And when not sucessful, it never returns.) */ + (And when not successful, it never returns.) */ argp_parse (&pfinet_argp, argc, argv, 0,0,0); task_get_bootstrap_port (mach_task_self (), &bootstrap); @@ -415,7 +415,7 @@ pfinet_bind (int portclass, const char *name) } if (err) - error (1, err, name); + error (1, err, "%s", name); ports_port_deref (cntl); |