From c06f91c48b044f8978e5c8115806ac625ac76497 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 6 Oct 2013 16:26:05 -0400 Subject: [PATCH] if the request client name could not be found for internal client, consider that a fatal error --- ipload.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/ipload.c b/ipload.c index 5d8ad7e..cd02937 100644 --- a/ipload.c +++ b/ipload.c @@ -125,30 +125,24 @@ main (int argc, char *argv[]) } exit (1); } - if (status & JackServerStarted) { - fprintf (stderr, "JACK server started\n"); - } - if (status & JackNameNotUnique) { - client_name = jack_get_client_name(client); - fprintf (stderr, "unique name `%s' assigned\n", client_name); - } /* then, load the internal client */ jack_internal_client_load (client, intclient_name, (JackLoadName|JackLoadInit), &status, intclient, load_name, load_init); + if (status & JackNameNotUnique) { + fprintf (stderr, "unique internal client name `%s' assigned\n", + load_name); + return 3; + } + if (status & JackFailure) { - fprintf (stderr, "could not load %s, status = 0x%2.0x\n", - load_name, status); + fprintf (stderr, "could not load %s, status = 0x%x\n", + client_name, status); return 2; } - if (status & JackNameNotUnique) { - intclient_name = jack_get_internal_client_name (client, intclient); - fprintf (stderr, "unique internal client name `%s' assigned\n", - intclient_name); - } fprintf (stdout, "%s is running.\n", load_name);