mcabber: mcabber/mcabber/commands.c comparison

comparison mcabber/mcabber/commands.c @ 2186:a852aed87ac0

Cosmetics/coding style

author	Mikael Berthe <mikael@lilotux.net>
date	Thu, 01 Oct 2015 23:03:06 +0200
parents	f14537ee3476
children	ee3a40ffcd8b

comparison

equal deleted inserted replaced

-:f14537ee3476
+:a852aed87ac0
 GSList *sel;
 if (!name)
 return FALSE;
 for (sel = safe_commands; sel; sel = sel->next)
 if (!strcmp((const char *)sel->data, name)) {
-if (safe)
+if (safe) {
 return FALSE;
-else {
+} else {
 g_free(sel->data);
 safe_commands = g_slist_delete_link(safe_commands, sel);
 }
 }
 if (safe)
 if (scr_get_multimode()) {
 scr_append_multiline("");
 return;
 }
 if (current_buddy) {
-if (buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_GROUP)
+if (buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_GROUP) {
 do_group("toggle");
-else {
+} else {
 // Enter chat mode
 scr_set_chatmode(TRUE);
 scr_show_buddy_window();
 }
 }
 roster_note(arg);
 } else if (!strcasecmp(subcmd, "resource_lock")) {
 roster_resourcelock(arg, TRUE);
 } else if (!strcasecmp(subcmd, "resource_unlock")) {
 roster_resourcelock(arg, FALSE);
-} else
+} else {
 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!");
+}
 free_arg_lst(paramlst);
 }
 void do_color(char *arg)
 {
 g_free(wildcard);
 } else if (!strcasecmp(subcmd, "muc")) {
 char **arglist = split_arg(arg, 2, 0);
 char *free_muc = to_utf8(*arglist);
 const char *muc = free_muc, *mode = arglist[1];
-if (!muc || !*muc)
+if (!muc || !*muc) {
 scr_LogPrint(LPRINT_NORMAL, "What MUC?");
-else {
+} else {
 if (!strcmp(muc, "."))
 if (!(muc = CURRENT_JID))
 scr_LogPrint(LPRINT_NORMAL, "No JID selected");
 if (muc) {
-if (check_jid_syntax(muc) && strcmp(muc, "*"))
+if (check_jid_syntax(muc) && strcmp(muc, "*")) {
 scr_LogPrint(LPRINT_NORMAL, "Not a JID");
-else {
+} else {
 if (!mode || !*mode || !strcasecmp(mode, "on"))
 scr_muc_color(muc, MC_ALL);
 else if (!strcasecmp(mode, "preset"))
 scr_muc_color(muc, MC_PRESET);
 else if (!strcasecmp(mode, "off"))
 if (!nick || !*nick || !color || !*color)
 scr_LogPrint(LPRINT_NORMAL, "Missing argument");
 else
 scr_muc_nick_color(nick, color);
 free_arg_lst(arglist);
-} else
+} else {
 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!");
+}
 free_arg_lst(paramlst);
 }
 //  cmd_setstatus(recipient, arg)
 // Set your Jabber status.
 arg = *(paramlst+1);
 if (!subcmd || !*subcmd)
 goto do_group_return;   // Should not happen
-if (!strcasecmp(subcmd, "expand") || !strcasecmp(subcmd, "unfold"))
+if (!strcasecmp(subcmd, "expand") || !strcasecmp(subcmd, "unfold")) {
 group_state = group_unfold;
-else if (!strcasecmp(subcmd, "shrink") || !strcasecmp(subcmd, "fold"))
+} else if (!strcasecmp(subcmd, "shrink") || !strcasecmp(subcmd, "fold")) {
 group_state = group_fold;
-else if (!strcasecmp(subcmd, "toggle"))
+} else if (!strcasecmp(subcmd, "toggle")) {
 group_state = group_toggle;
-else {
+} else {
 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!");
 goto do_group_return;
 }
 if (arg && *arg) {
 file = g_strdup(*paramlst);
 // One more parameter shift...
 oldparamlst = paramlst;
 paramlst = split_arg(*(oldparamlst+1), 2, 1); // jid, nothing
 free_arg_lst(oldparamlst);
-} else
+} else {
 break;
+}
 }
 if (!*paramlst) {
 scr_LogPrint(LPRINT_NORMAL, "Wrong usage.");
 free_arg_lst(paramlst);
 } else {
 char *res_utf8 = to_utf8(fjid+2);
 fjid = g_strdup_printf("%s%c%s", cjid, JID_RESOURCE_SEPARATOR, res_utf8);
 g_free(res_utf8);
 }
-} else
+} else {
 fjid = to_utf8(fjid);
-} else
+}
+} else {
 fjid = to_utf8(fjid);
+}
 if (!fjid) {
 scr_LogPrint(LPRINT_NORMAL, "The Jabber ID is invalid.");
 free_arg_lst(paramlst);
 return;
 if (append_server) {
 gchar *res = strchr(fjid, JID_RESOURCE_SEPARATOR);
 uncompletedfjid = fjid;
 if (res) {
 *res++ = '\0';
-fjid = g_strdup_printf("%s%c%s%c%s", fjid, JID_DOMAIN_SEPARATOR, append_server,
+fjid = g_strdup_printf("%s%c%s%c%s", fjid, JID_DOMAIN_SEPARATOR,
-JID_RESOURCE_SEPARATOR, res);
+append_server, JID_RESOURCE_SEPARATOR, res);
-} else
+} else {
-fjid = g_strdup_printf("%s%c%s", fjid, JID_DOMAIN_SEPARATOR, append_server);
+fjid = g_strdup_printf("%s%c%s", fjid, JID_DOMAIN_SEPARATOR,
+append_server);
+}
 }
 }
 if (check_jid_syntax(fjid)) {
 scr_LogPrint(LPRINT_NORMAL, "Please specify a valid Jabber ID.");
 enum { style_normal = 0, style_detail, style_short,
 style_quiet, style_compact } style = 0;
 int cnt = 0;
 if (*arg) {
-if (!strcasecmp(arg, "--short"))
+if (!strcasecmp(arg, "--short")) {
 style = style_short;
-else if (!strcasecmp(arg, "--quiet"))
+} else if (!strcasecmp(arg, "--quiet")) {
 style = style_quiet;
-else if (!strcasecmp(arg, "--detail"))
+} else if (!strcasecmp(arg, "--detail")) {
 style = style_detail;
-else if (!strcasecmp(arg, "--compact"))
+} else if (!strcasecmp(arg, "--compact")) {
 style = style_compact;
-else {
+} else {
 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!");
 return;
 }
 }
 bjid = buddy_getjid(bud);
 name = buddy_getname(bud);
 type = buddy_gettype(bud);
 on_srv = buddy_getonserverflag(bud);
-if (on_srv)
+if (on_srv) {
 xmpp_updatebuddy(bjid, name, *groupname ? groupname : NULL);
-else {
+} else {
 buddy_setgroup(bud, (char *)groupname);
 if ((type & ROSTER_TYPE_ROOM) && xmpp_is_bookmarked(bjid) &&
 settings_opt_get_int("muc_bookmark_autoupdate"))
 room_bookmark(bud, NULL);
 }
 }
 g_free(format);
 scr_setmsgflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE);
 scr_setattentionflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE,
 ROSTER_UI_PRIO_STATUS_WIN_MESSAGE, prio_max);
-} else
+} else {
 scr_LogPrint(LPRINT_NORMAL, "No options found.");
+}
 return;
 }
 assign = parse_assigment(arg, &option, &value);
 if (!option) {
 jid_utf8 = to_utf8(fjid);
 reason_utf8 = to_utf8(arg);
 xmpp_room_setattrib(roomid, jid_utf8, NULL, ra, reason_utf8);
 g_free(jid_utf8);
 g_free(reason_utf8);
-} else
+} else {
 scr_LogPrint(LPRINT_NORMAL, "Wrong affiliation parameter.");
+}
 free_arg_lst(paramlst);
 }
 static void room_role(gpointer bud, char *arg)
 jid_utf8 = to_utf8(fjid);
 reason_utf8 = to_utf8(arg);
 xmpp_room_setattrib(roomid, jid_utf8, NULL, ra, reason_utf8);
 g_free(jid_utf8);
 g_free(reason_utf8);
-} else
+} else {
 scr_LogPrint(LPRINT_NORMAL, "Wrong role parameter.");
+}
 free_arg_lst(paramlst);
 }
 if (!tmp) {
 scr_LogPrint(LPRINT_NORMAL, "Wrong JID or nickname");
 goto room_ban_return;
 }
 banjid = jidtodisp(tmp);
-} else
+} else {
 banjid = jid_utf8;
+}
 scr_LogPrint(LPRINT_NORMAL, "Requesting a ban for %s", banjid);
 reason_utf8 = to_utf8(arg);
 xmpp_room_setattrib(roomid, banjid, NULL, ra, reason_utf8);
 scr_LogPrint(LPRINT_NORMAL, "Please specify a room option.");
 free_arg_lst(paramlst);
 return;
 }
-if (!strcasecmp(param, "print_status"))
+if (!strcasecmp(param, "print_status")) {
 option = opt_printstatus;
-else if (!strcasecmp(param, "auto_whois"))
+} else if (!strcasecmp(param, "auto_whois")) {
 option = opt_autowhois;
-else if (!strcasecmp(param, "flag_joins"))
+} else if (!strcasecmp(param, "flag_joins")) {
 option = opt_flagjoins;
-else {
+} else {
 scr_LogPrint(LPRINT_NORMAL, "Wrong option!");
 free_arg_lst(paramlst);
 return;
 }
 return;
 }
 if (option == opt_printstatus) {
 enum room_printstatus eval;
-if (!strcasecmp(value, "none"))
+if (!strcasecmp(value, "none")) {
 eval = status_none;
-else if (!strcasecmp(value, "in_and_out"))
+} else if (!strcasecmp(value, "in_and_out")) {
 eval = status_in_and_out;
-else if (!strcasecmp(value, "all"))
+} else if (!strcasecmp(value, "all")) {
 eval = status_all;
-else {
+} else {
 eval = status_default;
 if (strcasecmp(value, "default") != 0)
 scr_LogPrint(LPRINT_NORMAL, "Unrecognized value, assuming default...");
 }
 if (eval != buddy_getprintstatus(bud)) {
 buddy_setprintstatus(bud, eval);
 changed = 1;
 }
 } else if (option == opt_autowhois) {
 enum room_autowhois eval;
-if (!strcasecmp(value, "on"))
+if (!strcasecmp(value, "on")) {
 eval = autowhois_on;
-else if (!strcasecmp(value, "off"))
+} else if (!strcasecmp(value, "off")) {
 eval = autowhois_off;
-else {
+} else {
 eval = autowhois_default;
 if (strcasecmp(value, "default") != 0)
 scr_LogPrint(LPRINT_NORMAL, "Unrecognized value, assuming default...");
 }
 if (eval != buddy_getautowhois(bud)) {
 buddy_setautowhois(bud, eval);
 changed = 1;
 }
 } else if (option == opt_flagjoins) {
 enum room_flagjoins eval;
-if (!strcasecmp(value, "none"))
+if (!strcasecmp(value, "none")) {
 eval = flagjoins_none;
-else if (!strcasecmp(value, "joins"))
+} else if (!strcasecmp(value, "joins")) {
 eval = flagjoins_joins;
-else if (!strcasecmp(value, "all"))
+} else if (!strcasecmp(value, "all")) {
 eval = flagjoins_all;
-else {
+} else {
 eval = flagjoins_default;
 if (strcasecmp(value, "default") != 0)
 scr_LogPrint(LPRINT_NORMAL, "Unrecognized value, assuming default...");
 }
 if (eval != buddy_getflagjoins(bud)) {
 if (interactive) {
 // Enter chat mode
 scr_set_chatmode(TRUE);
 scr_show_buddy_window();
-} else
+} else {
 msg_flag |= HBB_PREFIX_NOFLAG;
+}
 bjid = buddy_getjid(bud);
 rstatus = buddy_getstatus(bud, nick);
 if (rstatus == offline) {
 scr_LogPrint(LPRINT_NORMAL, "Unrecognized or missing parameter!");
 free_arg_lst(paramlst);
 return;
 }
-if (op == otr_k)
+if (op == otr_k) {
 otr_key();
-else {
+} else {
 // Allow special jid "" or "." (current buddy)
 if (fjid && (!*fjid || !strcmp(fjid, ".")))
 fjid = NULL;
 if (fjid) {
 case otr_info:
 otr_print_info(fjid);         break;
 default:
 break;
 }
-} else
+} else {
 scr_LogPrint(LPRINT_NORMAL, "Please specify a valid Jabber ID.");
+}
 }
 free_arg_lst(paramlst);
 #else
 scr_LogPrint(LPRINT_NORMAL, "Please recompile mcabber with libotr enabled.");
 "(plain|manual|opportunistic|always)");
 free_arg_lst(paramlst);
 return;
 }
-if (!strcasecmp(policy, "plain"))
+if (!strcasecmp(policy, "plain")) {
 p = plain;
-else if (!strcasecmp(policy, "manual"))
+} else if (!strcasecmp(policy, "manual")) {
 p = manual;
-else if (!strcasecmp(policy, "opportunistic"))
+} else if (!strcasecmp(policy, "opportunistic")) {
 p = opportunistic;
-else if (!strcasecmp(policy, "always"))
+} else if (!strcasecmp(policy, "always")) {
 p = always;
-else {
+} else {
 /* Fail, we don't know _this_ policy*/
 scr_LogPrint(LPRINT_NORMAL, "mcabber doesn't support _this_ policy!");
 free_arg_lst(paramlst);
 return;
 }
 char *a = flist.gl_pathv[j+1];
 char *b = flist.gl_pathv[j];
 if (strcmp(a, b) < 0) {
 flist.gl_pathv[j]   = a;
 flist.gl_pathv[j+1] = b;
-} else
+} else {
 break;
+}
 }
 }
 // source files in list
 for (i=0; i < flist.gl_pathc; ++i) {
 recur_level++;

Mercurial > ~mikael > mcabber > hg

comparison mcabber/mcabber/commands.c @ 2186:a852aed87ac0