1 files changed, 29 insertions, 29 deletions

diff --git a/src/social/gnunet-social.c b/src/social/gnunet-social.c
index 4a46fdc99..228d69d58 100644
--- a/src/social/gnunet-social.c
+++ b/src/social/gnunet-social.c
@@ -1212,78 +1212,78 @@ main (int argc, char *const *argv)
 
     /* operations */
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('A',
+    GNUNET_GETOPT_option_flag ('A',
                                   "host-assign",
                                   gettext_noop ("assign --name in state to --data"),
                                   &op_host_assign),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('B',
+    GNUNET_GETOPT_option_flag ('B',
                                   "guest-leave",
                                   gettext_noop ("say good-bye and leave somebody else's place"),
                                   &op_guest_leave),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('C',
+    GNUNET_GETOPT_option_flag ('C',
                                   "host-enter",
                                   gettext_noop ("create a place"),
                                   &op_host_enter),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('C',
+    GNUNET_GETOPT_option_flag ('C',
                                   "host-enter",
                                   gettext_noop ("create a place"),
                                   &op_host_enter),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('D',
+    GNUNET_GETOPT_option_flag ('D',
                                   "host-leave",
                                   gettext_noop ("destroy a place we were hosting"),
                                   &op_host_leave),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('E',
+    GNUNET_GETOPT_option_flag ('E',
                                   "guest-enter",
                                   gettext_noop ("enter somebody else's place"),
                                   &op_guest_enter),
 
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('F',
+    GNUNET_GETOPT_option_flag ('F',
                                   "look-for",
                                   gettext_noop ("find state matching name prefix"),
                                   &op_look_for),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('H',
+    GNUNET_GETOPT_option_flag ('H',
                                   "replay-latest",
                                   gettext_noop ("replay history of messages up to the given --limit"),
                                   &op_replay_latest),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('N',
+    GNUNET_GETOPT_option_flag ('N',
                                   "host-reconnect",
                                   gettext_noop ("reconnect to a previously created place"),
                                   &op_host_reconnect),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('P',
+    GNUNET_GETOPT_option_flag ('P',
                                   "host-announce",
                                   gettext_noop ("publish something to a place we are hosting"),
                                   &op_host_announce),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('R',
+    GNUNET_GETOPT_option_flag ('R',
                                   "guest-reconnect",
                                   gettext_noop ("reconnect to a previously entered place"),
                                   &op_guest_reconnect),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('S',
+    GNUNET_GETOPT_option_flag ('S',
                                   "look-at",
                                   gettext_noop ("search for state matching exact name"),
                                   &op_look_at),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('T',
+    GNUNET_GETOPT_option_flag ('T',
                                   "guest-talk",
                                   gettext_noop ("submit something to somebody's place"),
                                   &op_guest_talk),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('U',
+    GNUNET_GETOPT_option_flag ('U',
                                   "status",
                                   gettext_noop ("list of egos and subscribed places"),
                                   &op_status),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('X',
+    GNUNET_GETOPT_option_flag ('X',
                                   "replay",
                                   gettext_noop ("extract and replay history between message IDs --start and --until"),
                                   &op_replay),
@@ -1291,83 +1291,83 @@ main (int argc, char *const *argv)
 
     /* options */
 
-    GNUNET_GETOPT_OPTION_STRING ('a',
+    GNUNET_GETOPT_option_string ('a',
                                  "app",
                                  "APPLICATION_ID",
                                  gettext_noop ("application ID to use when connecting"),
                                  &opt_app),
 
-    GNUNET_GETOPT_OPTION_STRING ('d',
+    GNUNET_GETOPT_option_string ('d',
                                  "data",
                                  "DATA",
                                  gettext_noop ("message body or state value"),
                                  &opt_data),
 
-    GNUNET_GETOPT_OPTION_STRING ('e',
+    GNUNET_GETOPT_option_string ('e',
                                  "ego",
                                  "NAME|PUBKEY",
                                  gettext_noop ("name or public key of ego"),
                                  &opt_ego),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('f',
+    GNUNET_GETOPT_option_flag ('f',
                                   "follow",
                                   gettext_noop ("wait for incoming messages"),
                                   &opt_follow),
 
-    GNUNET_GETOPT_OPTION_STRING ('g',
+    GNUNET_GETOPT_option_string ('g',
                                  "gns",
                                  "GNS_NAME",
                                  gettext_noop ("GNS name"),
                                  &opt_gns),
 
-    GNUNET_GETOPT_OPTION_STRING ('i',
+    GNUNET_GETOPT_option_string ('i',
                                  "peer",
                                  "PEER_ID",
                                  gettext_noop ("peer ID for --guest-enter"),
                                  &opt_peer),
 
-    GNUNET_GETOPT_OPTION_STRING ('k',
+    GNUNET_GETOPT_option_string ('k',
                                  "name",
                                  "VAR_NAME",
                                  gettext_noop ("name (key) to query from state"),
                                  &opt_name),
 
-    GNUNET_GETOPT_OPTION_STRING ('m',
+    GNUNET_GETOPT_option_string ('m',
                                  "method",
                                  "METHOD_NAME",
                                  gettext_noop ("method name"),
                                  &opt_method),
 
-    GNUNET_GETOPT_OPTION_SET_ULONG ('n',
+    GNUNET_GETOPT_option_ulong ('n',
                                     "limit",
                                     NULL,
                                     gettext_noop ("number of messages to replay from history"),
                                     &opt_limit),
 
-    GNUNET_GETOPT_OPTION_STRING ('p',
+    GNUNET_GETOPT_option_string ('p',
                                  "place",
                                  "PUBKEY",
                                  gettext_noop ("key address of place"),
                                  &opt_place),
 
-    GNUNET_GETOPT_OPTION_SET_ULONG ('s',
+    GNUNET_GETOPT_option_ulong ('s',
                                     "start",
                                     NULL,
                                     gettext_noop ("start message ID for history replay"),
                                     &opt_start),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('w',
+    GNUNET_GETOPT_option_flag ('w',
                                   "welcome",
                                   gettext_noop ("respond to entry requests by admitting all guests"),
                                   &opt_welcome),
 
-    GNUNET_GETOPT_OPTION_SET_ULONG ('u',
+    GNUNET_GETOPT_option_ulong ('u',
                                     "until",
                                     NULL,
                                     gettext_noop ("end message ID for history replay"),
                                     &opt_until),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('y',
+    GNUNET_GETOPT_option_flag ('y',
                                   "deny",
                                   gettext_noop ("respond to entry requests by refusing all guests"),
                                   &opt_deny),