Merge branch 'develop' of https://github.com/ennorehling/eressea.git

src/kernel/building.c

@@ -75,15 +75,16 @@ static building_type *bt_find_i(const char *name)
     if (match) {
         cb_get_kv(match, &btype, sizeof(btype));
     }
-    else {
-        log_warning("st_find: could not find ship '%s'\n", name);
-    }
     return btype;
 }
 
 const building_type *bt_find(const char *name)
 {
-    return bt_find_i(name);
+    building_type *btype = bt_find_i(name);
+    if (!btype) {
+        log_warning("bt_find: could not find building '%s'\n", name);
+    }
+    return btype;
 }
 
 static int bt_changes = 1;

src/kernel/ship.c

@@ -97,14 +97,15 @@ static ship_type *st_find_i(const char *name)
     if (match) {
         cb_get_kv(match, &st, sizeof(st));
     }
-    else {
-        log_warning("st_find: could not find ship '%s'\n", name);
-    }
     return st;
 }
 
 const ship_type *st_find(const char *name) {
-    return st_find_i(name);
+    ship_type *st = st_find_i(name);
+    if (!st) {
+        log_warning("st_find: could not find ship '%s'\n", name);
+    }
+    return st;
 }
 
 static void st_register(ship_type *stype) {

src/laws.test.c

@@ -1446,10 +1446,6 @@ static void test_show_both(CuTest *tc) {
     test_cleanup();
 }
 
-static int low_wage(const region * r, const faction * f, const race * rc, int in_turn) {
-    return 1;
-}
-
 static void test_immigration(CuTest * tc)
 {
     region *r;