]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
fixup! using more portable field from glob_t structure: gl_pathc
authorDiego dos Santos Fronza <diego@isc.org>
Mon, 16 Sep 2019 19:10:55 +0000 (16:10 -0300)
committerDiego Fronza <diego@isc.org>
Tue, 22 Oct 2019 14:30:02 +0000 (11:30 -0300)
lib/isccfg/parser.c

index f1ad258c7f7180beed3584969fb520e3e27c5093..1d8f32da40367d82a55b8ccc67729e56091b8d50 100644 (file)
@@ -104,7 +104,7 @@ parser_complain(cfg_parser_t *pctx, bool is_warning,
                unsigned int flags, const char *format, va_list args);
 
 static isc_result_t
-glob_include(const char * restrict pattern, glob_t * restrict pglob); 
+glob_include(const char * restrict pattern, glob_t * restrict pglob);
 
 #if defined(HAVE_GEOIP2)
 static isc_result_t
@@ -1973,7 +1973,7 @@ cfg_parse_mapbody(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret)
                        CHECK(glob_include(includename->value.string.base, &glob_obj));
                        cfg_obj_destroy(pctx, &includename);
 
-                       for (int i = 0; i < glob_obj.gl_matchc; ++i) {
+                       for (size_t i = 0; i < glob_obj.gl_pathc; ++i) {
                                CHECK(parser_openfile(pctx, glob_obj.gl_pathv[i]));
                        }
 
@@ -3673,4 +3673,3 @@ glob_include(const char * restrict pattern, glob_t * restrict pglob)
        }
 
 }
-