NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

libvirtd: start each diagnostic with "argv0: "

Browse Source 
Some diagnostics had a hard-coded "libvirtd: " prefix, some used
"error: " and some used "argv[0]: ".  Always use "argv[0]: ".
* daemon/libvirtd.c (argv0): New global.
(main): Set it.
(version, usage): Remove argv0 parameter.  Use global; update callers.
(daemonForkIntoBackground): Use argv0:, not error:.
(qemudWritePidFile): Start each diagnostic with argv0:.
Suggested by Eric Blake.
This commit is contained in:
Jim Meyering 2010-05-20 21:40:54 +02:00
parent 0c31633834
commit d5fda6d6bc
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
daemon/libvirtd.c
View File

@ -190,6 +190,7 @@ static int max_client_requests = 5;
static sig_atomic_t sig_errors = 0; static sig_atomic_t sig_errors = 0;
static int sig_lasterrno = 0; static int sig_lasterrno = 0;
static const char *argv0;
enum { enum {
VIR_DAEMON_ERR_NONE = 0, VIR_DAEMON_ERR_NONE = 0,
@ -484,8 +485,8 @@ static int daemonForkIntoBackground(void) {
if (ret == 1 && status != 0) { if (ret == 1 && status != 0) {
fprintf(stderr, fprintf(stderr,
_("error: %s. Check /var/log/messages or run without " _("%s: error: %s. Check /var/log/messages or run without "
"--daemon for more info.\n"), "--daemon for more info.\n"), argv0,
virDaemonErrTypeToString(status)); virDaemonErrTypeToString(status));
} }
_exit(ret == 1 && status == 0 ? 0 : 1); _exit(ret == 1 && status == 0 ? 0 : 1);
@ -515,15 +516,15 @@ static int qemudWritePidFile(const char *pidFile) {
} }
if (fprintf(fh, "%lu\n", (unsigned long)getpid()) < 0) { if (fprintf(fh, "%lu\n", (unsigned long)getpid()) < 0) {
VIR_ERROR(_("Failed to write to pid file '%s' : %s"), VIR_ERROR(_("%s: Failed to write to pid file '%s' : %s"),
pidFile, virStrerror(errno, ebuf, sizeof ebuf)); argv0, pidFile, virStrerror(errno, ebuf, sizeof ebuf));
fclose(fh); fclose(fh);
return -1; return -1;
} }
if (fclose(fh) == EOF) { if (fclose(fh) == EOF) {
VIR_ERROR(_("Failed to close pid file '%s' : %s"), VIR_ERROR(_("%s: Failed to close pid file '%s' : %s"),
pidFile, virStrerror(errno, ebuf, sizeof ebuf)); argv0, pidFile, virStrerror(errno, ebuf, sizeof ebuf));
return -1; return -1;
} }
@ -2868,7 +2869,7 @@ remoteReadConfigFile (struct qemud_server *server, const char *filename)
/* Display version information. */ /* Display version information. */
static void static void
version (const char *argv0) version (void)
{ {
printf ("%s (%s) %s\n", argv0, PACKAGE_NAME, PACKAGE_VERSION); printf ("%s (%s) %s\n", argv0, PACKAGE_NAME, PACKAGE_VERSION);
} }
@ -2960,7 +2961,7 @@ error:
/* Print command-line usage. */ /* Print command-line usage. */
static void static void
usage (const char *argv0) usage (void)
{ {
fprintf (stderr, fprintf (stderr,
_("\n\ _("\n\
@ -3021,6 +3022,7 @@ int main(int argc, char **argv) {
const char *remote_config_file = NULL; const char *remote_config_file = NULL;
int statuswrite = -1; int statuswrite = -1;
int ret = 1; int ret = 1;
argv0 = argv[0];
struct option opts[] = { struct option opts[] = {
{ "verbose", no_argument, &verbose, 1}, { "verbose", no_argument, &verbose, 1},
@ -3035,7 +3037,7 @@ int main(int argc, char **argv) {
}; };
if (virInitialize() < 0) { if (virInitialize() < 0) {
fprintf (stderr, _("libvirtd: initialization failed\n")); fprintf (stderr, _("%s: initialization failed\n"), argv0);
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
@ -3081,16 +3083,16 @@ int main(int argc, char **argv) {
break; break;
case OPT_VERSION: case OPT_VERSION:
version (argv[0]); version ();
return 0; return 0;
case '?': case '?':
usage (argv[0]); usage ();
return 2; return 2;
default: default:
fprintf (stderr, _("libvirtd: internal error: unknown flag: %c\n"), fprintf (stderr, _("%s: internal error: unknown flag: %c\n"),
c); argv0, c);
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
} }