X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=avahi-utils%2Favahi-publish.c;h=4e751763196ccbb3e5b9ec092359e0c486287879;hb=f16fb5b323ef49cec531a817a66c88503c32fc46;hp=9ca2df21a38db473adc73aec9a729a3caf580851;hpb=3b95a93e59997c56d75f26fffcdad5b9006d71c5;p=catta

diff --git a/avahi-utils/avahi-publish.c b/avahi-utils/avahi-publish.c
index 9ca2df2..4e75176 100644
--- a/avahi-utils/avahi-publish.c
+++ b/avahi-utils/avahi-publish.c
@@ -189,7 +189,11 @@ static void client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UN
 
             if (config->verbose)
                 fprintf(stderr, "Host name conflict\n");
+
+            /* Fall through */
             
+        case AVAHI_CLIENT_S_REGISTERING:
+
             if (entry_group) {
                 avahi_entry_group_free(entry_group);
                 entry_group = NULL;
@@ -200,9 +204,9 @@ static void client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UN
             
             if (config->verbose)
                 fprintf(stderr, "Waiting for daemon ...\n");
+            
             break;
             
-        case AVAHI_CLIENT_S_REGISTERING:
             ;
     }
 }
@@ -252,7 +256,6 @@ static int parse_command_line(Config *c, const char *argv0, int argc, char *argv
     c->port = 0;
     c->txt = c->subtypes = NULL;
 
-    opterr = 0;
     while ((o = getopt_long(argc, argv, "hVsavd:H:f", long_options, NULL)) >= 0) {
 
         switch(o) {
@@ -286,7 +289,6 @@ static int parse_command_line(Config *c, const char *argv0, int argc, char *argv
                 c->subtypes = avahi_string_list_add(c->subtypes, optarg);
                 break;
             default:
-                fprintf(stderr, "Invalid command line argument: %c\n", o);
                 return -1;
         }
     }