nickserv/multimark: clean up various style violations pointed out with clang

diff --git a/modules/nickserv/multimark.c b/modules/nickserv/multimark.c
index b9f433f54b4d148c6d188c5dd643e5f63770f3c8..80992425cc2b0bf1981b013a81ec5f2906562cf2 100644 (file)
--- a/modules/nickserv/multimark.c
+++ b/modules/nickserv/multimark.c
@@ -637,7 +637,7 @@ static void show_multimark(hook_user_req_t *hdata)
 
                strftime(time, sizeof time, TIME_FORMAT, &tm);
 
-               if ( setter = myuser_find_uid(mm->setter_uid) )
+               if ((setter = myuser_find_uid(mm->setter_uid)) != NULL)
                {
                        setter_name = entity(setter)->name;
                }
@@ -646,9 +646,9 @@ static void show_multimark(hook_user_req_t *hdata)
                        setter_name = mm->setter_name;
                }
 
-               if ( mm->restored_from_uid == NULL )
+               if (mm->restored_from_uid == NULL)
                {
-                       if ( strcasecmp (setter_name, mm->setter_name) )
+                       if (strcasecmp(setter_name, mm->setter_name))
                        {
                                command_success_nodata(
                                        hdata->si,
@@ -674,10 +674,10 @@ static void show_multimark(hook_user_req_t *hdata)
                }
                else
                {
-                       if ( strcasecmp (setter_name, mm->setter_name) )
+                       if (strcasecmp(setter_name, mm->setter_name))
                        {
                                myuser_t *user;
-                               if (user = myuser_find_uid(mm->restored_from_uid))
+                               if ((user = myuser_find_uid(mm->restored_from_uid)) != NULL)
                                {
                                        command_success_nodata(
                                                hdata->si,
@@ -708,7 +708,7 @@ static void show_multimark(hook_user_req_t *hdata)
                        else
                        {
                                myuser_t *user;
-                               if (user = myuser_find_uid(mm->restored_from_uid))
+                               if ((user = myuser_find_uid(mm->restored_from_uid)) != NULL)
                                {
                                        command_success_nodata(
                                                hdata->si,
@@ -767,7 +767,7 @@ static void show_multimark_noexist(hook_info_noexist_req_t *hdata)
 
                strftime(time, sizeof time, TIME_FORMAT, &tm);
 
-               if ( setter = myuser_find_uid(rm->setter_uid) )
+               if ((setter = myuser_find_uid(rm->setter_uid)) != NULL)
                {
                        setter_name = entity(setter)->name;
                }
@@ -776,7 +776,7 @@ static void show_multimark_noexist(hook_info_noexist_req_t *hdata)
                        setter_name = rm->setter_name;
                }
 
-               if ( strcasecmp (setter_name, rm->setter_name) )
+               if (strcasecmp(setter_name, rm->setter_name))
                {
                        command_success_nodata(
                                hdata->si,
@@ -907,7 +907,7 @@ static void ns_cmd_multimark(sourceinfo_t *si, int parc, char *parv[])
 
                                strftime(time, sizeof time, TIME_FORMAT, &tm);
 
-                               if ( setter = myuser_find_uid(rm->setter_uid) )
+                               if ((setter = myuser_find_uid(rm->setter_uid)) != NULL)
                                {
                                        setter_name = entity(setter)->name;
                                }
@@ -916,7 +916,7 @@ static void ns_cmd_multimark(sourceinfo_t *si, int parc, char *parv[])
                                        setter_name = rm->setter_name;
                                }
 
-                               if ( strcasecmp (setter_name, rm->setter_name) )
+                               if (strcasecmp(setter_name, rm->setter_name))
                                {
                                        command_success_nodata(
                                                si,
@@ -953,7 +953,7 @@ static void ns_cmd_multimark(sourceinfo_t *si, int parc, char *parv[])
 
                        strftime(time, sizeof time, TIME_FORMAT, &tm);
 
-                       if ( setter = myuser_find_uid(mm->setter_uid) )
+                       if ((setter = myuser_find_uid(mm->setter_uid)) != NULL)
                        {
                                setter_name = entity(setter)->name;
                        }
@@ -962,9 +962,9 @@ static void ns_cmd_multimark(sourceinfo_t *si, int parc, char *parv[])
                                setter_name = mm->setter_name;
                        }
 
-                       if ( mm->restored_from_uid == NULL )
+                       if (mm->restored_from_uid == NULL)
                        {
-                               if ( strcasecmp (setter_name, mm->setter_name) )
+                               if (strcasecmp(setter_name, mm->setter_name))
                                {
                                        command_success_nodata(
                                                si,
@@ -990,10 +990,10 @@ static void ns_cmd_multimark(sourceinfo_t *si, int parc, char *parv[])
                        }
                        else
                        {
-                               if ( strcasecmp (setter_name, mm->setter_name) )
+                               if (strcasecmp(setter_name, mm->setter_name))
                                {
                                        myuser_t *user;
-                                       if (user = myuser_find_uid(mm->restored_from_uid))
+                                       if ((user = myuser_find_uid(mm->restored_from_uid)) != NULL)
                                        {
                                                command_success_nodata(
                                                        si,
@@ -1024,7 +1024,7 @@ static void ns_cmd_multimark(sourceinfo_t *si, int parc, char *parv[])
                                else
                                {
                                        myuser_t *user;
-                                       if (user = myuser_find_uid(mm->restored_from_uid))
+                                       if ((user = myuser_find_uid(mm->restored_from_uid)) != NULL)
                                        {
                                                command_success_nodata(
                                                        si,
@@ -1071,7 +1071,7 @@ static void ns_cmd_multimark(sourceinfo_t *si, int parc, char *parv[])
                {
                        mm = n->data;
 
-                       if ( mm->number == num )
+                       if (mm->number == num)
                        {
                                mowgli_node_delete(&mm->node, l);