diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-03-02 15:39:43 -0800 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-03-03 11:35:29 +0100 |
| commit | 8d4a84a44b85dd982f3130d004c29c8382f516ac (patch) | |
| tree | 94ce8cd286f2c7d9586400b863ee66dddbe662a8 | |
| parent | 835a1112dc5ca8d066fa1d0e2dfb979c19bf58be (diff) | |
shutdown: rename shutdown RPC to shutdown_shutdown
For coherency with usage, and to avoid conflicting with shutdown(2)
* hurd/shutdown.defs (shutdown): Rename to shutdown_shutdown.
* shutdown/shutdown.c (S_shutdown): Rename to S_shutdown_shutdown.
* startup/startup.c (do_shutdown): Call shutdown_shutdown instead of
shutdown.
| -rw-r--r-- | hurd/shutdown.defs | 2 | ||||
| -rw-r--r-- | shutdown/shutdown.c | 2 | ||||
| -rw-r--r-- | startup/startup.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/hurd/shutdown.defs b/hurd/shutdown.defs index b2ceb751..afd586bc 100644 --- a/hurd/shutdown.defs +++ b/hurd/shutdown.defs @@ -28,6 +28,6 @@ SHUTDOWN_IMPORTS /* * Shut down the computer */ -routine shutdown ( +routine shutdown_shutdown ( server : shutdown_t ); diff --git a/shutdown/shutdown.c b/shutdown/shutdown.c index 44ae975a..f821b1f2 100644 --- a/shutdown/shutdown.c +++ b/shutdown/shutdown.c @@ -54,7 +54,7 @@ struct port_class *trivfs_protid_class; struct port_class *trivfs_control_class; kern_return_t -S_shutdown(trivfs_protid_t server) +S_shutdown_shutdown(trivfs_protid_t server) { disappear_via_acpi(); return 0; diff --git a/startup/startup.c b/startup/startup.c index 33b5b9f2..fd16eb73 100644 --- a/startup/startup.c +++ b/startup/startup.c @@ -189,7 +189,7 @@ do_shutdown (void) if (! MACH_PORT_VALID (pc)) return errno; - shutdown (pc); + shutdown_shutdown (pc); return 0; } |