From: Hongwei Bi Date: Thu, 27 Mar 2014 05:49:48 +0000 (+0800) Subject: util: fix a typo in virprocess.c and docs X-Git-Tag: v1.2.3-rc2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2ed4f68b415db7d4e26dea79301ab3c9e4ac5ef;p=thirdparty%2Flibvirt.git util: fix a typo in virprocess.c and docs s/forcably/forcibly Signed-off-by: Hongwei Bi Signed-off-by: Eric Blake --- diff --git a/docs/internals/command.html.in b/docs/internals/command.html.in index fc767d96b1..64365b25e3 100644 --- a/docs/internals/command.html.in +++ b/docs/internals/command.html.in @@ -547,7 +547,7 @@ There is no need to check if cmd is NULL before calling virCommandFree. This scenario is handled automatically. If the command is still running, - it will be forcably killed and cleaned up (via waitpid). + it will be forcibly killed and cleaned up (via waitpid).

Complete examples

diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 91e3e3b9a6..930b7e8002 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -4,7 +4,7 @@ * Description: Provides the interfaces of the libvirt library to handle * virtualized domains * - * Copyright (C) 2005-2006, 2010-2013 Red Hat, Inc. + * Copyright (C) 2005-2006, 2010-2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -4635,7 +4635,7 @@ typedef enum { VIR_DOMAIN_EVENT_WATCHDOG_NONE = 0, /* No action, watchdog ignored */ VIR_DOMAIN_EVENT_WATCHDOG_PAUSE, /* Guest CPUs are paused */ VIR_DOMAIN_EVENT_WATCHDOG_RESET, /* Guest CPUs are reset */ - VIR_DOMAIN_EVENT_WATCHDOG_POWEROFF, /* Guest is forcably powered off */ + VIR_DOMAIN_EVENT_WATCHDOG_POWEROFF, /* Guest is forcibly powered off */ VIR_DOMAIN_EVENT_WATCHDOG_SHUTDOWN, /* Guest is requested to gracefully shutdown */ VIR_DOMAIN_EVENT_WATCHDOG_DEBUG, /* No action, a debug message logged */ diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 405ad06f21..9179d73b99 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -283,7 +283,7 @@ int virProcessKill(pid_t pid, int sig) * Try to kill the process and verify it has exited * * Returns 0 if it was killed gracefully, 1 if it - * was killed forcably, -1 if it is still alive, + * was killed forcibly, -1 if it is still alive, * or another error occurred. */ int