On Wed, Aug 07, 2013 at 04:53:30PM -0600, Eric Blake wrote:
> Commit 3d0e3c1 reintroduced a problem previously squelched in
> commit 7e5aa78. Add a syntax check this time around.
Didn't notice we want to avoid this sorry.
>
> util/virutil.c: In function 'virGetGroupList':
> util/virutil.c:1015: error: 'for' loop initial declaration used outside C99 mode
>
> * cfg.mk (sc_prohibit_loop_var_decl): New rule.
> * src/util/virutil.c (virGetGroupList): Fix offender.
>
> Signed-off-by: Eric Blake <eblake@xxxxxxxxxx>
> ---
>
> Pushing under the build-breaker rule.
>
> cfg.mk | 12 +++++++++---
> src/util/virutil.c | 8 ++++----
> 2 files changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/cfg.mk b/cfg.mk
> index 13de268..791c393 100644
> --- a/cfg.mk
> +++ b/cfg.mk
> @@ -546,15 +546,21 @@ sc_avoid_attribute_unused_in_header:
> $(_sc_search_regexp)
>
> sc_prohibit_int_ijk:
> - @prohibit='\<(int|unsigned) ([^(]* )*(i|j|k)(\s|,|;)' \
> + @prohibit='\<(int|unsigned) ([^(]* )*(i|j|k)(\s|,|;)' \
> halt='use size_t, not int/unsigned int for loop vars i, j, k' \
> $(_sc_search_regexp)
>
> sc_prohibit_loop_iijjkk:
> - @prohibit='\<(int|unsigned) ([^=]+ )*(ii|jj|kk)(\s|,|;)' \
> - halt='use i, j, k for loop iterators, not ii, jj, kk' \
> + @prohibit='\<(int|unsigned) ([^=]+ )*(ii|jj|kk)(\s|,|;)' \
> + halt='use i, j, k for loop iterators, not ii, jj, kk' \
> $(_sc_search_regexp)
>
> +# RHEL 5 gcc can't grok "for (int i..."
> +sc_prohibit_loop_var_decl:
> + @prohibit='\<for *\(\w+[ *]+\w+' \
> + in_vc_files='\.[ch]$$' \
> + halt='declare loop iterators outside the for statement' \
> + $(_sc_search_regexp)
>
> # Many of the function names below came from this filter:
> # git grep -B2 '\<_('|grep -E '\.c- *[[:alpha:]_][[:alnum:]_]* ?\(.*[,;]$' \
> diff --git a/src/util/virutil.c b/src/util/virutil.c
> index 3de72ea..34f5998 100644
> --- a/src/util/virutil.c
> +++ b/src/util/virutil.c
> @@ -1010,18 +1010,18 @@ virGetGroupList(uid_t uid, gid_t gid, gid_t **list)
> }
>
> if (gid != (gid_t)-1) {
> - size_t n = ret;
> + size_t i;
>
> - for (size_t i = 0; i < ret; i++) {
> + for (i = 0; i < ret; i++) {
> if ((*list)[i] == gid)
> goto cleanup;
> }
> - if (VIR_APPEND_ELEMENT(*list, n, gid) < 0) {
> + if (VIR_APPEND_ELEMENT(*list, i, gid) < 0) {
> ret = -1;
> VIR_FREE(*list);
> goto cleanup;
> } else {
> - ret = n;
> + ret = i;
And safeing a variable, nice! ACK.
-_ Guido
> }
> }
>
> --
> 1.8.3.1
>
> --
> libvir-list mailing list
> libvir-list@xxxxxxxxxx
> https://www.redhat.com/mailman/listinfo/libvir-list
>
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list