fix -Wmissing-field-initializers warnings (#2753)

and fix of -Wignored-qualifiers warnings in r.terraflow/types.h
OSGeo · Jan 17, 2023 · 445a9d7 · 445a9d7
1 parent 7780e94
commit 445a9d7
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
diff --git a/lib/gis/parser_dependencies.c b/lib/gis/parser_dependencies.c
@@ -58,7 +58,7 @@ struct rule {
     void **opts;
 };
 
-static struct vector rules = {sizeof(struct rule), 50};
+static struct vector rules = {.elsize = sizeof(struct rule), .increment = 50};
 
 /*! \brief Set generic option rule
 

diff --git a/raster/r.in.png/main.c b/raster/r.in.png/main.c
@@ -41,7 +41,9 @@ typedef struct {
 #define C_B 4
 #define C_A 5
 
-static channel channels[6] = {{""}, {""}, {".r"}, {".g"}, {".b"}, {".a"}};
+static channel channels[6] = {{.suffix = ""},   {.suffix = ""},
+                              {.suffix = ".r"}, {.suffix = ".g"},
+                              {.suffix = ".b"}, {.suffix = ".a"}};
 
 static int Header;
 static int Float;

diff --git a/raster/r.terraflow/types.h b/raster/r.terraflow/types.h
@@ -85,11 +85,8 @@ class labelFactory {
 public:
     static cclabel_type getNewLabel() { return ++label; }
     static cclabel_type getCurrentLabel() { return label; }
-    static const cclabel_type getLabelInit()
-    {
-        return cclabel_type(LABEL_START);
-    }
-    static const cclabel_type getLabelCount() { return label + 1; }
+    static cclabel_type getLabelInit() { return cclabel_type(LABEL_START); }
+    static cclabel_type getLabelCount() { return label + 1; }
     static void setLabelCount(int n) { label = n - 1; }
     static void reset() { label = getLabelInit(); }
 };

diff --git a/raster/r.uslek/prct2tex.c b/raster/r.uslek/prct2tex.c
@@ -111,29 +111,29 @@ int prct2tex(double sand_input, double clay_input, double silt_input)
     /*G_message("in prct2tex()"); */
     /*setup the 3Dvectors and initialize them */
     /* index 0 */
-    struct vector cls_clay[POLYGON_DIMENSION] = {{0.0}};
+    struct vector cls_clay[POLYGON_DIMENSION] = {{.sand = 0.0}};
     /* index 1 */
-    struct vector cls_sandy_clay[POLYGON_DIMENSION] = {{0.0}};
+    struct vector cls_sandy_clay[POLYGON_DIMENSION] = {{.sand = 0.0}};
     /* index 2 */
-    struct vector cls_silty_clay[POLYGON_DIMENSION] = {{0.0}};
+    struct vector cls_silty_clay[POLYGON_DIMENSION] = {{.sand = 0.0}};
     /* index 3 */
-    struct vector cls_sandy_clay_loam[POLYGON_DIMENSION] = {{0.0}};
+    struct vector cls_sandy_clay_loam[POLYGON_DIMENSION] = {{.sand = 0.0}};
     /* index 4 */
-    struct vector cls_clay_loam[POLYGON_DIMENSION] = {{0.0}};
+    struct vector cls_clay_loam[POLYGON_DIMENSION] = {{.sand = 0.0}};
     /* index 5 */
-    struct vector cls_silty_clay_loam[POLYGON_DIMENSION] = {{0.0}};
+    struct vector cls_silty_clay_loam[POLYGON_DIMENSION] = {{.sand = 0.0}};
     /* index 6 */
-    struct vector cls_sand[POLYGON_DIMENSION] = {{0.0}};
+    struct vector cls_sand[POLYGON_DIMENSION] = {{.sand = 0.0}};
     /* index 7 */
-    struct vector cls_loamy_sand[POLYGON_DIMENSION] = {{0.0}};
+    struct vector cls_loamy_sand[POLYGON_DIMENSION] = {{.sand = 0.0}};
     /* index 8 */
-    struct vector cls_sandy_loam[POLYGON_DIMENSION] = {{0.0}};
+    struct vector cls_sandy_loam[POLYGON_DIMENSION] = {{.sand = 0.0}};
     /* index 9 */
-    struct vector cls_loam[POLYGON_DIMENSION] = {{0.0}};
+    struct vector cls_loam[POLYGON_DIMENSION] = {{.sand = 0.0}};
     /* index 10 */
-    struct vector cls_silt_loam[POLYGON_DIMENSION] = {{0.0}};
+    struct vector cls_silt_loam[POLYGON_DIMENSION] = {{.sand = 0.0}};
     /* index 11 */
-    struct vector cls_silt[POLYGON_DIMENSION] = {{0.0}};
+    struct vector cls_silt[POLYGON_DIMENSION] = {{.sand = 0.0}};
 
     if ((sand_input + clay_input + silt_input) <= 10.0) {
         sand_input = sand_input * 100.0;