Use not f_name variable but __func__, standardize function name writing.

[plomrogue] / src / server / god_commands.c

diff --git a/src/server/god_commands.c b/src/server/god_commands.c
index efb607d9083adb3767c28fbd05bf684959682a76..674ff6229e06328cee8bdb999036c2fcc172ffee 100644 (file)
--- a/src/server/god_commands.c
+++ b/src/server/god_commands.c
@@ -133,8 +133,8 @@ static uint8_t parse_thingaction_manipulation(char * tok0, char * tok1)
         return 1;
     }
     uint8_t id;
-    if      (parse_val(tok0, tok1, s[S_CMD_TA_EFFORT],'8',(char *) &ta->effort));
-    else if (parse_val(tok0, tok1, s[S_CMD_TA_NAME], 's', (char *) &ta->name))
+    if      (parse_val(tok0, tok1, s[S_CMD_TA_EFFORT],'8',(char *)&ta->effort));
+    else if (parse_val(tok0, tok1, s[S_CMD_TA_NAME], 's', (char *)&ta->name))
     {
         if (!(   try_func_name(ta, s[S_CMD_MOVE], actor_move)
               || try_func_name(ta, s[S_CMD_PICKUP], actor_pick)
@@ -332,7 +332,6 @@ static uint8_t world_may_be_set_active()
 
 static uint8_t parse_world_active(char * tok0, char * tok1)
 {
-    char * f_name = "parse_world_active()";
     if (!strcmp(tok0, s[S_CMD_WORLD_ACTIVE]) && !parsetest_int(tok1, '8'))
     {
         if (!parsetest_int(tok1, '8'))
@@ -343,7 +342,7 @@ static uint8_t parse_world_active(char * tok0, char * tok1)
                 if (!access(s[S_PATH_WORLDSTATE], F_OK))
                 {
                     int test = unlink(s[S_PATH_WORLDSTATE]);
-                    exit_trouble(-1 == test, f_name, "unlink()");
+                    exit_trouble(-1 == test, __func__, "unlink");
                 }
                 world.exists = 0;
             }