city_generator2

commit 78551a85829748ce60488f4eace3eccf82a02907
parent 8855db34a45bf18c26019c781d24fca53f5dc087
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Fri, 28 Apr 2023 11:20:55 +0200

Fix warnings

Diffstat:
M
src/cg_city.c
 | 
2
+-
M
src/cg_construction_mode_0.c
 | 
4
++--
M
src/cg_construction_mode_1.c
 | 
6
+++---

3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/cg_city.c b/src/cg_city.c
@@ -96,7 +96,7 @@ unregister_close_building
     ptr = htable_building_find(&b->close_buildings, &building);
     if(!ptr) continue; /* No registered information */
     n = htable_building_erase(&b->close_buildings, &building);
-    ASSERT(n == 1);
+    ASSERT(n == 1); (void)n;
   }
 }
 
diff --git a/src/cg_construction_mode_0.c b/src/cg_construction_mode_0.c
@@ -537,7 +537,7 @@ build_cad_cmode_0
   int error_occured = 0, error_msg_printed = 0;
   struct scpr_device* scpr;
   struct mem_allocator* allocator;
-  struct logger* logger;
+  struct logger* logger = NULL;
   size_t c;
 
   if (!building || !cad || !adjoining_data) {
@@ -684,7 +684,7 @@ exit:
   if(cad) *(struct data_cad_cmode_0**)cad = data_cad;
   return res;
 error:
-  if(building && !error_msg_printed) {
+  if(logger && building && !error_msg_printed) {
     logger_print(logger, LOG_ERROR,
         "Unknown error building CAD for building '%s'.\n",
         str_cget(&building->name));
diff --git a/src/cg_construction_mode_1.c b/src/cg_construction_mode_1.c
@@ -53,7 +53,7 @@ build_floor
   double e_floor = data->floor_thickness;
   double offset = 0;
   struct scpr_polygon* pg_int = NULL;
-  struct scpr_polygon** ptr_p;
+  struct scpr_polygon** ptr_p = NULL;
   size_t nverts = 0;
   struct scad_geometry* footprint = NULL;
   double d[3] = {0, 0, 0};
@@ -1541,7 +1541,7 @@ build_cad_cmode_1
   double zero = 0;
   struct scpr_device* scpr;
   struct mem_allocator* allocator;
-  struct logger* logger;
+  struct logger* logger = NULL;
 
   if (!building || !cad || !adjoining_data) {
     res = RES_BAD_ARG;
@@ -1748,7 +1748,7 @@ exit:
   if(cad) *(struct data_cad_cmode_1**)cad = data_cad;
   return res;
 error:
-  if(building && !error_msg_printed) {
+  if(logger && building && !error_msg_printed) {
     logger_print(logger, LOG_ERROR,
         "Unknown error building CAD for building '%s'.\n",
         str_cget(&building->name));