X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-utils%2Favahi-resolve.c;h=16bb1b59c2e4b5918da815d2ac4180d693592f7b;hb=dd8365aee5f2c61880120c49ea898399c8667a13;hp=2dafbf07e796c4d0ad8402063074e3637effd7d1;hpb=93ac6c737b2566e76162ad70c35c0167de82c76b;p=catta

diff --git a/avahi-utils/avahi-resolve.c b/avahi-utils/avahi-resolve.c
index 2dafbf0..16bb1b5 100644
--- a/avahi-utils/avahi-resolve.c
+++ b/avahi-utils/avahi-resolve.c
@@ -43,10 +43,6 @@
 
 #include "sigint.h"
 
-#ifdef HAVE_GDBM
-#include "stdb.h"
-#endif
-
 typedef enum {
     COMMAND_UNSPEC, 
     COMMAND_HELP,
@@ -168,8 +164,8 @@ static void help(FILE *f, const char *argv0) {
             "    -v --verbose         Enable verbose mode\n"
             "    -6                   Lookup IPv6 address\n"
             "    -4                   Lookup IPv4 address\n",
-            argv0, strstr(argv0, "address") ? "[-a]" : "-a",
-            argv0, strstr(argv0, "host-name") ? "[-n]" : "-n");
+            argv0, strstr(argv0, "host-name") ? "[-n]" : "-n",
+            argv0, strstr(argv0, "address") ? "[-a]" : "-a");
 }
 
 static int parse_command_line(Config *c, const char *argv0, int argc, char *argv[]) {
@@ -190,7 +186,6 @@ static int parse_command_line(Config *c, const char *argv0, int argc, char *argv
     c->proto = AVAHI_PROTO_UNSPEC;
     c->verbose = 0;
 
-    opterr = 0;
     while ((o = getopt_long(argc, argv, "hVnav46", long_options, NULL)) >= 0) {
 
         switch(o) {
@@ -216,7 +211,6 @@ static int parse_command_line(Config *c, const char *argv0, int argc, char *argv
                 c->proto = AVAHI_PROTO_INET6;
                 break;
             default:
-                fprintf(stderr, "Invalid command line argument: %c\n", o);
                 return -1;
         }
     }