From 1f0d5f205e06fefe26ec40e5831b76bfaa4134b4 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Wed, 16 May 2012 16:52:12 -0700
Subject: [PATCH] rename _log_error to log_error and get rid of the cumbersome
 #define

---
 src/main.c             | 9 ++++-----
 src/monsters.c         | 2 +-
 src/spells/shipcurse.c | 2 +-
 src/spells/spells.c    | 8 +++-----
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/main.c b/src/main.c
index 00a277a82..7e339bacc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -243,9 +243,8 @@ void locale_init(void)
   setlocale(LC_CTYPE, "");
   setlocale(LC_NUMERIC, "C");
   if (towlower(0xC4) != 0xE4) { /* &Auml; => &auml; */
-    log_error(
-      ("Umlaut conversion is not working properly. Wrong locale? LANG=%s\n",
-        getenv("LANG")));
+    log_error("Umlaut conversion is not working properly. Wrong locale? LANG=%s\n",
+        getenv("LANG"));
   }
 }
 
@@ -274,7 +273,7 @@ int main(int argc, char **argv)
 
   err = eressea_init();
   if (err) {
-    log_error(("initialization failed with code %d\n", err));
+    log_error("initialization failed with code %d\n", err);
     return err;
   }
   register_races();
@@ -289,7 +288,7 @@ int main(int argc, char **argv)
 
   err = eressea_run(luafile, entry_point);
   if (err) {
-    log_error(("server execution failed with code %d\n", err));
+    log_error("server execution failed with code %d\n", err);
     return err;
   }
 #ifdef MSPACES
diff --git a/src/monsters.c b/src/monsters.c
index 3040bbfb5..53c27e91e 100644
--- a/src/monsters.c
+++ b/src/monsters.c
@@ -490,7 +490,7 @@ static order *monster_seeks_target(region * r, unit * u)
 
   /* TODO: prüfen, ob target überhaupt noch existiert... */
   if (!target) {
-    log_error(("Monster '%s' hat kein Ziel!\n", unitname(u)));
+    log_error("Monster '%s' hat kein Ziel!\n", unitname(u));
     return NULL;                /* this is a bug workaround! remove!! */
   }
 
diff --git a/src/spells/shipcurse.c b/src/spells/shipcurse.c
index 275be2c50..e481dc571 100644
--- a/src/spells/shipcurse.c
+++ b/src/spells/shipcurse.c
@@ -48,7 +48,7 @@ message *cinfo_ship(const void *obj, typ_t typ, const curse * c, int self)
     msg = msg_message("curseinfo::ship_unknown", "id", c->no);
   }
   if (msg == NULL) {
-    log_error(("There is no curseinfo for %s.\n", c->type->cname));
+    log_error("There is no curseinfo for %s.\n", c->type->cname);
   }
   return msg;
 }
diff --git a/src/spells/spells.c b/src/spells/spells.c
index a376b1fea..9894c43d0 100644
--- a/src/spells/spells.c
+++ b/src/spells/spells.c
@@ -476,7 +476,7 @@ static const race *select_familiar(const race * magerace, magic_t magiegebiet)
     retval = magerace->familiars[0];
   }
   if (!retval) {
-    log_error(("select_familiar: No familiar (not even a default) defined for %s.\n", magerace->_name[0]));
+    log_error("select_familiar: No familiar (not even a default) defined for %s.\n", magerace->_name[0]);
   }
   return retval;
 }
@@ -490,8 +490,7 @@ static void make_familiar(unit * familiar, unit * mage)
   if (familiar->race->init_familiar != NULL) {
     familiar->race->init_familiar(familiar);
   } else {
-    log_error(("could not perform initialization for familiar %s.\n",
-        familiar->faction->race->_name[0]));
+    log_error("could not perform initialization for familiar %s.\n", familiar->faction->race->_name[0]);
   }
 
   /* triggers: */
@@ -521,8 +520,7 @@ static int sp_summon_familiar(castorder * co)
   }
   rc = select_familiar(mage->faction->race, mage->faction->magiegebiet);
   if (rc == NULL) {
-    log_error(("could not find suitable familiar for %s.\n",
-        mage->faction->race->_name[0]));
+    log_error("could not find suitable familiar for %s.\n", mage->faction->race->_name[0]);
     return 0;
   }