eolian: fix shadow warningsdevs/q66/eolian_todo

3 files changed, 18 insertions, 18 deletions

diff --git a/src/bin/eolian/legacy_generator.c b/src/bin/eolian/legacy_generator.c
index 1047a41e82..a21041e46f 100644
--- a/src/bin/eolian/legacy_generator.c
+++ b/src/bin/eolian/legacy_generator.c
@@ -258,9 +258,9 @@ _eapi_func_generate(const Eolian_Class *class, const Eolian_Function *funcid, Eo
         if (ftype == EOLIAN_PROP_GET || eolian_function_object_is_const(funcid))
            eina_strbuf_append(fparam, "const ");
         eina_strbuf_append_printf(fparam, "%s *obj", class_env.full_classname);
-        char buf[256];
-        snprintf(buf, sizeof(buf), "(%s *)obj", class_env.full_classname);
-        eina_strbuf_replace_all(fbody, "@#eo_obj", buf);
+        char cbuf[256];
+        snprintf(cbuf, sizeof(cbuf), "(%s *)obj", class_env.full_classname);
+        eina_strbuf_replace_all(fbody, "@#eo_obj", cbuf);
      }
    else
      {
diff --git a/src/lib/eolian/database_type.c b/src/lib/eolian/database_type.c
index 75191c2736..47e2ea91b8 100644
--- a/src/lib/eolian/database_type.c
+++ b/src/lib/eolian/database_type.c
@@ -99,9 +99,9 @@ _stype_to_str(const Eolian_Type *tp, Eina_Strbuf *buf, const char *name)
    eina_strbuf_append(buf, "struct ");
    if (tp->name)
      {
-        Eina_List *l;
+        Eina_List *m;
         const char *sp;
-        EINA_LIST_FOREACH(tp->namespaces, l, sp)
+        EINA_LIST_FOREACH(tp->namespaces, m, sp)
           {
              eina_strbuf_append(buf, sp);
              eina_strbuf_append_char(buf, '_');
@@ -135,9 +135,9 @@ _etype_to_str(const Eolian_Type *tp, Eina_Strbuf *buf, const char *name)
    eina_strbuf_append(buf, "enum ");
    if (tp->name)
      {
-        Eina_List *l;
+        Eina_List *m;
         const char *sp;
-        EINA_LIST_FOREACH(tp->namespaces, l, sp)
+        EINA_LIST_FOREACH(tp->namespaces, m, sp)
           {
              eina_strbuf_append(buf, sp);
              eina_strbuf_append_char(buf, '_');
@@ -333,11 +333,11 @@ database_type_print(Eolian_Type *tp)
    else if (tp->type == EOLIAN_TYPE_STRUCT)
      {
         const char *fname;
-        Eina_List *l;
+        Eina_List *m;
         printf("struct ");
         if (tp->full_name) printf("%s ", tp->full_name);
         printf("{ ");
-        EINA_LIST_FOREACH(tp->field_names, l, fname)
+        EINA_LIST_FOREACH(tp->field_names, m, fname)
           {
              Eolian_Struct_Field *sf = eina_hash_find(tp->fields, fname);
              printf("%s: ", fname);
@@ -349,10 +349,10 @@ database_type_print(Eolian_Type *tp)
    else if (tp->type == EOLIAN_TYPE_ENUM)
      {
         const char *fname;
-        Eina_List *l;
+        Eina_List *m;
         printf("enum %s ", tp->full_name);
         printf("{ ");
-        EINA_LIST_FOREACH(tp->field_names, l, fname)
+        EINA_LIST_FOREACH(tp->field_names, m, fname)
           {
              Eolian_Enum_Field *ef = eina_hash_find(tp->fields, fname);
              printf("%s", fname);
@@ -361,7 +361,7 @@ database_type_print(Eolian_Type *tp)
                   printf(" = ");
                   database_expr_print(ef->value);
                }
-             if (l != eina_list_last(tp->field_names))
+             if (m != eina_list_last(tp->field_names))
                printf(", ");
           }
         printf(" }");
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index ce6d33b642..60a43c0926 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -782,17 +782,17 @@ parse_type_named_void(Eo_Lexer *ls, Eina_Bool allow_named)
      {
       case KW_const:
         {
-           int line, col;
+           int pline, pcol;
            eo_lexer_get(ls);
-           line = ls->line_number;
-           col = ls->column;
+           pline = ls->line_number;
+           pcol = ls->column;
            check_next(ls, '(');
            def = parse_type_void(ls);
            def->base.file = eina_stringshare_ref(ls->filename);
            def->base.line = line;
            def->base.column = col;
            def->is_const = EINA_TRUE;
-           check_match(ls, ')', '(', line, col);
+           check_match(ls, ')', '(', pline, pcol);
            goto parse_ptr;
         }
       case KW_own:
@@ -970,7 +970,7 @@ parse_ptr:
      }
    if (ls->t.token == '<')
      {
-        int line = ls->line_number, col = ls->column;
+        int bline = ls->line_number, bcol = ls->column;
         eo_lexer_get(ls);
         def->subtypes = eina_list_append(def->subtypes, parse_type(ls));
         pop_type(ls);
@@ -979,7 +979,7 @@ parse_ptr:
              def->subtypes = eina_list_append(def->subtypes, parse_type(ls));
              pop_type(ls);
           }
-        check_match(ls, '>', '<', line, col);
+        check_match(ls, '>', '<', bline, bcol);
      }
    return def;
 }