]> git.puffer.fish Git - matthieu/frr.git/commitdiff
tools: generate northbound code without warnings
authorRafael Zalamena <rzalamena@opensourcerouting.org>
Mon, 29 Jul 2019 22:28:59 +0000 (19:28 -0300)
committerRafael Zalamena <rzalamena@opensourcerouting.org>
Mon, 29 Jul 2019 22:28:59 +0000 (19:28 -0300)
Use the alternate struct instantiation that does not generates warning
on old compilers.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
tools/gen_northbound_callbacks.c

index e9a4e39bbefccf69c5a18da86155add43b17ce3e..ade5b3e2276b12eef7267abe4668764461eb92fa 100644 (file)
@@ -238,17 +238,20 @@ static int generate_nb_nodes(const struct lys_node *snode, void *arg)
                        printf("\t\t{\n"
                               "\t\t\t.xpath = \"%s\",\n",
                               xpath);
+                       printf("\t\t\t.cbs = {\n");
                        first = false;
                }
 
                generate_callback_name((struct lys_node *)snode, cb->operation,
                                       cb_name, sizeof(cb_name));
-               printf("\t\t\t.cbs.%s = %s,\n",
-                      nb_operation_name(cb->operation), cb_name);
+               printf("\t\t\t\t.%s = %s,\n", nb_operation_name(cb->operation),
+                      cb_name);
        }
 
-       if (!first)
+       if (!first) {
+               printf("\t\t\t}\n");
                printf("\t\t},\n");
+       }
 
        return YANG_ITER_CONTINUE;
 }