Rename GA's error to GA_ERROR for more consistency with other glib bindings

[catta] / avahi-autoipd / main.c

diff --git a/avahi-autoipd/main.c b/avahi-autoipd/main.c
index 8cab9f557641836f5551d312958579d60896a65b..d4b9b6deb0ab292afb6579e983c07aa7334d512e 100644 (file)
--- a/avahi-autoipd/main.c
+++ b/avahi-autoipd/main.c
@@ -1011,7 +1011,7 @@ static int drop_privs(void) {
 #elif defined(HAVE_SETREGID)
         r = setregid(gr->gr_gid, gr->gr_gid);
 #else
-#error "No API to drop priviliges"
+#error "No API to drop privileges"
 #endif
 
         if (r < 0) {
@@ -1027,7 +1027,7 @@ static int drop_privs(void) {
 #elif defined(HAVE_SETREUID)
         r = setreuid(pw->pw_uid, pw->pw_uid);
 #else
-#error "No API to drop priviliges"
+#error "No API to drop privileges"
 #endif
         
         if (r < 0) {
@@ -1432,7 +1432,7 @@ static void help(FILE *f, const char *a0) {
             "    -S --start=ADDRESS  Start with this address from the IPv4LL range\n"
             "                        169.254.0.0/16\n"
             "    -t --script=script  Action script to run (defaults to\n"
-            "                        /etc/avahi/avahi-autoipd.action)\n"
+            "                        "AVAHI_IPCONF_SCRIPT")\n"
             "    -w --wait           Wait until an address has been acquired before\n"
             "                        daemonizing\n"
             "       --force-bind     Assign an IPv4LL address even if a routable address\n"