Message ID | 339a1ea1-64a5-1d71-346e-5bfdd8c110f7@redhat.com |
---|---|
State | Accepted, archived |
Headers | show |
Series | libext2fs: remove c99 idiom to fix build | expand |
On 6/23/18 2:51 PM, Eric Sandeen wrote: > hashmap.c: In function ‘ext2fs_hashmap_free’: > hashmap.c:72:2: error: ‘for’ loop initial declarations are only allowed in C99 mode > for (size_t i = 0; i < h->size; ++i) { > ^ > hashmap.c:72:2: note: use option -std=c99 or -std=gnu99 to compile your code > make[2]: *** [hashmap.o] Error 1 Might add: Fixes: 555a0fc ("AOSP: e2fsdroid/libext2fs: move hashmap into libext2fs") > Signed-off-by: Eric Sandeen <sandeen@redhat.com> > --- > > diff --git a/lib/ext2fs/hashmap.c b/lib/ext2fs/hashmap.c > index ade5d89..3d8ee81 100644 > --- a/lib/ext2fs/hashmap.c > +++ b/lib/ext2fs/hashmap.c > @@ -69,7 +69,9 @@ void *ext2fs_hashmap_iter_in_order(struct ext2fs_hashmap *h, > > void ext2fs_hashmap_free(struct ext2fs_hashmap *h) > { > - for (size_t i = 0; i < h->size; ++i) { > + size_t i; > + > + for (i = 0; i < h->size; ++i) { > struct ext2fs_hashmap_entry *it = h->entries[i]; > while (it) { > struct ext2fs_hashmap_entry *tmp = it->next; >
On Sat, Jun 23, 2018 at 02:51:03PM -0500, Eric Sandeen wrote: > hashmap.c: In function ‘ext2fs_hashmap_free’: > hashmap.c:72:2: error: ‘for’ loop initial declarations are only allowed in C99 mode > for (size_t i = 0; i < h->size; ++i) { > ^ > hashmap.c:72:2: note: use option -std=c99 or -std=gnu99 to compile your code > make[2]: *** [hashmap.o] Error 1 > > Signed-off-by: Eric Sandeen <sandeen@redhat.com> Applied, thanks. - Ted
diff --git a/lib/ext2fs/hashmap.c b/lib/ext2fs/hashmap.c index ade5d89..3d8ee81 100644 --- a/lib/ext2fs/hashmap.c +++ b/lib/ext2fs/hashmap.c @@ -69,7 +69,9 @@ void *ext2fs_hashmap_iter_in_order(struct ext2fs_hashmap *h, void ext2fs_hashmap_free(struct ext2fs_hashmap *h) { - for (size_t i = 0; i < h->size; ++i) { + size_t i; + + for (i = 0; i < h->size; ++i) { struct ext2fs_hashmap_entry *it = h->entries[i]; while (it) { struct ext2fs_hashmap_entry *tmp = it->next;
hashmap.c: In function ‘ext2fs_hashmap_free’: hashmap.c:72:2: error: ‘for’ loop initial declarations are only allowed in C99 mode for (size_t i = 0; i < h->size; ++i) { ^ hashmap.c:72:2: note: use option -std=c99 or -std=gnu99 to compile your code make[2]: *** [hashmap.o] Error 1 Signed-off-by: Eric Sandeen <sandeen@redhat.com> ---