add gcc stack protector m4 to svn. unfortunately we cannot enable it (yet), because...

[catta] / avahi-utils / avahi-resolve.c

diff --git a/avahi-utils/avahi-resolve.c b/avahi-utils/avahi-resolve.c
index 477a4a57ae4c09d15550e1f12f393702bd863bea..fe01ae5dc943aad4a98108f7375ab8005bf50ce1 100644 (file)
--- 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,
@@ -167,8 +163,7 @@ static void help(FILE *f, const char *argv0) {
             "    -a --address         Resolve address\n"
             "    -v --verbose         Enable verbose mode\n"
             "    -6                   Lookup IPv6 address\n"
-            "    -4                   Lookup IPv4 address\n"
-            ,
+            "    -4                   Lookup IPv4 address\n",
             argv0, strstr(argv0, "address") ? "[-a]" : "-a",
             argv0, strstr(argv0, "host-name") ? "[-n]" : "-n");
 }
@@ -217,7 +212,7 @@ 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);
+                fprintf(stderr, "Invalid command line argument: %s\n", argv[optind-1]);
                 return -1;
         }
     }