[Mesa-dev] [PATCH 01/17] mesa: Fix warning about static being in the wrong place

[Ilia Mirkin]

Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>

On Wed, Aug 26, 2015 at 1:19 PM, Ian Romanick <idr at freedesktop.org> wrote:
> From: Ian Romanick <ian.d.romanick at intel.com>
>
> Because the compiler already has enough things to complain about.
>
>     grep -rl 'const static' src/ | while read f
>     do
>         sed --in-place -e 's/const static/static const/g' $f
>     done
>
> brw_eu_emit.c: In function 'brw_reg_type_to_hw_type':
> brw_eu_emit.c:98:7: warning: 'static' is not at beginning of declaration [-Wold-style-declaration]
>        const static int imm_hw_types[] = {
>        ^
> brw_eu_emit.c:120:7: warning: 'static' is not at beginning of declaration [-Wold-style-declaration]
>        const static int hw_types[] = {
>        ^
>
> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
> ---
>  src/egl/wayland/wayland-drm/wayland-drm.c    | 2 +-
>  src/gallium/drivers/i915/i915_fpc_optimize.c | 2 +-
>  src/glsl/builtin_types.cpp                   | 2 +-
>  src/glsl/ir_reader.cpp                       | 2 +-
>  src/mesa/drivers/dri/i965/brw_eu_emit.c      | 4 ++--
>  5 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/src/egl/wayland/wayland-drm/wayland-drm.c b/src/egl/wayland/wayland-drm/wayland-drm.c
> index e9c6e0a..e00d9be 100644
> --- a/src/egl/wayland/wayland-drm/wayland-drm.c
> +++ b/src/egl/wayland/wayland-drm/wayland-drm.c
> @@ -197,7 +197,7 @@ drm_authenticate(struct wl_client *client,
>                 wl_resource_post_event(resource, WL_DRM_AUTHENTICATED);
>  }
>
> -const static struct wl_drm_interface drm_interface = {
> +static const struct wl_drm_interface drm_interface = {
>         drm_authenticate,
>         drm_create_buffer,
>          drm_create_planar_buffer,
> diff --git a/src/gallium/drivers/i915/i915_fpc_optimize.c b/src/gallium/drivers/i915/i915_fpc_optimize.c
> index 83bb649..a2b6d27 100644
> --- a/src/gallium/drivers/i915/i915_fpc_optimize.c
> +++ b/src/gallium/drivers/i915/i915_fpc_optimize.c
> @@ -69,7 +69,7 @@ static boolean same_src_reg(struct i915_full_src_register *d1, struct i915_full_
>             d1->Register.Negate == d2->Register.Negate);
>  }
>
> -const static struct {
> +static const struct {
>     boolean is_texture;
>     boolean commutes;
>     unsigned neutral_element;
> diff --git a/src/glsl/builtin_types.cpp b/src/glsl/builtin_types.cpp
> index b0156a1..7bcba3f 100644
> --- a/src/glsl/builtin_types.cpp
> +++ b/src/glsl/builtin_types.cpp
> @@ -127,7 +127,7 @@ static const struct glsl_struct_field gl_FogParameters_fields[] = {
>  #define T(TYPE, MIN_GL, MIN_ES) \
>     { glsl_type::TYPE##_type, MIN_GL, MIN_ES },
>
> -const static struct builtin_type_versions {
> +static const struct builtin_type_versions {
>     const glsl_type *const type;
>     int min_gl;
>     int min_es;
> diff --git a/src/glsl/ir_reader.cpp b/src/glsl/ir_reader.cpp
> index 469837f..9796533 100644
> --- a/src/glsl/ir_reader.cpp
> +++ b/src/glsl/ir_reader.cpp
> @@ -26,7 +26,7 @@
>  #include "glsl_types.h"
>  #include "s_expression.h"
>
> -const static bool debug = false;
> +static const bool debug = false;
>
>  namespace {
>
> diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c b/src/mesa/drivers/dri/i965/brw_eu_emit.c
> index 4d39762..637fd07 100644
> --- a/src/mesa/drivers/dri/i965/brw_eu_emit.c
> +++ b/src/mesa/drivers/dri/i965/brw_eu_emit.c
> @@ -95,7 +95,7 @@ brw_reg_type_to_hw_type(const struct brw_device_info *devinfo,
>                          enum brw_reg_type type, unsigned file)
>  {
>     if (file == BRW_IMMEDIATE_VALUE) {
> -      const static int imm_hw_types[] = {
> +      static const int imm_hw_types[] = {
>           [BRW_REGISTER_TYPE_UD] = BRW_HW_REG_TYPE_UD,
>           [BRW_REGISTER_TYPE_D]  = BRW_HW_REG_TYPE_D,
>           [BRW_REGISTER_TYPE_UW] = BRW_HW_REG_TYPE_UW,
> @@ -117,7 +117,7 @@ brw_reg_type_to_hw_type(const struct brw_device_info *devinfo,
>        return imm_hw_types[type];
>     } else {
>        /* Non-immediate registers */
> -      const static int hw_types[] = {
> +      static const int hw_types[] = {
>           [BRW_REGISTER_TYPE_UD] = BRW_HW_REG_TYPE_UD,
>           [BRW_REGISTER_TYPE_D]  = BRW_HW_REG_TYPE_D,
>           [BRW_REGISTER_TYPE_UW] = BRW_HW_REG_TYPE_UW,
> --
> 2.1.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev