X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fsrc%2Fvkill.c;h=dad9cb723c2ea1343142931caf8074a975f7919d;hb=b30f4928376b71bd44021a951115e848e925d198;hp=dfb4d61e61a86eda9f2a68ba75810484cd19d96e;hpb=f2366c490d44f1bdb230a0ec6732ccfeac1445e4;p=util-vserver.git diff --git a/util-vserver/src/vkill.c b/util-vserver/src/vkill.c index dfb4d61..dad9cb7 100644 --- a/util-vserver/src/vkill.c +++ b/util-vserver/src/vkill.c @@ -19,10 +19,10 @@ #ifdef HAVE_CONFIG_H # include #endif -#include "compat.h" #include "vserver.h" #include "linuxvirtual.h" +#include "util.h" #include #include @@ -35,14 +35,9 @@ #include #include -#define VERSION_COPYRIGHT_DISCLAIMER - #define CMD_HELP 0x8000 #define CMD_VERSION 0x8001 -#define WRITE_MSG(FD,X) (void)(write(FD,X,sizeof(X)-1)) -#define WRITE_STR(FD,X) writeStr(FD,X) - static struct option const CMDLINE_OPTIONS[] = { { "help", no_argument, 0, CMD_HELP }, @@ -65,12 +60,6 @@ static char const * const SIGNALS[] = { 0, }; -inline static void UNUSED -writeStr(int fd, char const *cmd) -{ - (void)write(fd, cmd, strlen(cmd)); -} - static void showHelp(int fd, char const *cmd, int res) { @@ -115,11 +104,11 @@ str2sig(char const *str) #if defined(VC_ENABLE_API_LEGACY) inline static ALWAYSINLINE int -kill_wrapper_legacy(xid_t ctx, char const *proc, int sig) +kill_wrapper_legacy(xid_t UNUSED ctx, char const *proc, int UNUSED sig) { pid_t pid = fork(); if (pid==-1) { - perror("fork()"); + perror("vkill: fork()"); exit(1); } else if (pid==0) { @@ -132,7 +121,7 @@ kill_wrapper_legacy(xid_t ctx, char const *proc, int sig) } execl(LEGACYDIR "/vkill", "legacy/vkill", proc, (void *)(0)); - perror("execl()"); + perror("vkill: execl()"); exit(1); } @@ -146,7 +135,7 @@ kill_wrapper(xid_t ctx, char const *pid, int sig) return kill_wrapper_legacy(ctx, pid, sig); else { errno = err; - perror("vc_ctx_kill()"); + perror("vkill: vc_ctx_kill()"); return 1; } } @@ -158,7 +147,7 @@ inline static int kill_wrapper(xid_t ctx, char const *pid, int sig) { if (vc_ctx_kill(ctx,atoi(pid),sig)==-1) { - perror("vc_ctx_kill()"); + perror("vkill: vc_ctx_kill()"); return 1; } return 0;