[dia/zbrown/graphene-rect: 6/11] vdx: silence the final warnings

[Zander Brown <zbrown src gnome org>]

commit 763a9813bbf0602ce1f70451d4f617c3f6e3566b
Author: Zander Brown <zbrown gnome org>
Date:   Tue Apr 6 19:21:28 2021 +0100

    vdx: silence the final warnings

 plug-ins/vdx/vdx-export.c | 16 ++++++++--------
 plug-ins/vdx/vdx-xml.c    | 46 +++++++++++++++++++++++-----------------------
 2 files changed, 31 insertions(+), 31 deletions(-)
---
diff --git a/plug-ins/vdx/vdx-export.c b/plug-ins/vdx/vdx-export.c
index 5163efeda..9d26310d0 100644
--- a/plug-ins/vdx/vdx-export.c
+++ b/plug-ins/vdx/vdx-export.c
@@ -1265,7 +1265,7 @@ static void draw_string(DiaRenderer *self,
     struct vdx_XForm XForm;
     struct vdx_Para Para;
     struct vdx_Char Char;
-    struct vdx_Text Text;
+    struct vdx_Text vText;
     struct vdx_pp pp;
     struct vdx_cp cp;
     struct vdx_text my_text;
@@ -1344,8 +1344,8 @@ static void draw_string(DiaRenderer *self,
     cp.any.type = vdx_types_cp;
 
     /* Text object - no attributes */
-    memset(&Text, 0, sizeof(Text));
-    Text.any.type = vdx_types_Text;
+    memset(&vText, 0, sizeof(vText));
+    vText.any.type = vdx_types_Text;
 
     memset(&Para, 0, sizeof(Para));
     Para.any.type = vdx_types_Para;
@@ -1360,18 +1360,18 @@ static void draw_string(DiaRenderer *self,
     my_text.text = (char *)text;
 
     /* Construct the children */
-    Text.any.children = g_slist_append(Text.any.children, &pp);
-    Text.any.children = g_slist_append(Text.any.children, &cp);
-    Text.any.children = g_slist_append(Text.any.children, &my_text);
+    vText.any.children = g_slist_append(vText.any.children, &pp);
+    vText.any.children = g_slist_append(vText.any.children, &cp);
+    vText.any.children = g_slist_append(vText.any.children, &my_text);
 
     Shape.any.children = g_slist_append(Shape.any.children, &XForm);
     Shape.any.children = g_slist_append(Shape.any.children, &Char);
     Shape.any.children = g_slist_append(Shape.any.children, &Para);
-    Shape.any.children = g_slist_append(Shape.any.children, &Text);
+    Shape.any.children = g_slist_append(Shape.any.children, &vText);
 
     vdx_write_object(renderer->file, renderer->xml_depth, &Shape);
 
-    g_slist_free(Text.any.children);
+    g_slist_free(vText.any.children);
     g_slist_free(Shape.any.children);
 }
 
diff --git a/plug-ins/vdx/vdx-xml.c b/plug-ins/vdx/vdx-xml.c
index 68fd142bc..0a1edb020 100644
--- a/plug-ins/vdx/vdx-xml.c
+++ b/plug-ins/vdx/vdx-xml.c
@@ -3364,7 +3364,7 @@ vdx_write_object(FILE *file, unsigned int depth, const void *p)
     const struct vdx_ColorEntry *ColorEntry;
     const struct vdx_Colors *Colors;
     const struct vdx_Connect *Connect;
-    const struct vdx_Connection *Connection;
+    const struct vdx_Connection *vConnection;
     const struct vdx_Connects *Connects;
     const struct vdx_Control *Control;
     const struct vdx_CustomProp *CustomProp;
@@ -3387,7 +3387,7 @@ vdx_write_object(FILE *file, unsigned int depth, const void *p)
     const struct vdx_Foreign *Foreign;
     const struct vdx_ForeignData *ForeignData;
     const struct vdx_Geom *Geom;
-    const struct vdx_Group *Group;
+    const struct vdx_Group *vGroup;
     const struct vdx_HeaderFooter *HeaderFooter;
     const struct vdx_HeaderFooterFont *HeaderFooterFont;
     const struct vdx_Help *Help;
@@ -3418,14 +3418,14 @@ vdx_write_object(FILE *file, unsigned int depth, const void *p)
     const struct vdx_RulerGrid *RulerGrid;
     const struct vdx_Scratch *Scratch;
     const struct vdx_Shape *Shape;
-    const struct vdx_Shapes *Shapes;
+    const struct vdx_Shapes *Shapes G_GNUC_UNUSED;
     const struct vdx_SplineKnot *SplineKnot;
     const struct vdx_SplineStart *SplineStart;
     const struct vdx_StyleProp *StyleProp;
     const struct vdx_StyleSheet *StyleSheet;
     const struct vdx_Tab *Tab;
     const struct vdx_Tabs *Tabs;
-    const struct vdx_Text *Text;
+    const struct vdx_Text *vText G_GNUC_UNUSED;
     const struct vdx_TextBlock *TextBlock;
     const struct vdx_TextXForm *TextXForm;
     const struct vdx_User *User;
@@ -3629,26 +3629,26 @@ vdx_write_object(FILE *file, unsigned int depth, const void *p)
         break;
 
     case vdx_types_Connection:
-        Connection = (const struct vdx_Connection *)(p);
-        fprintf(file, "%s<Connection ID='%u' IX='%u'", pad, Connection->ID, Connection->IX);
-        if (Connection->NameU)
+        vConnection = (const struct vdx_Connection *)(p);
+        fprintf(file, "%s<Connection ID='%u' IX='%u'", pad, vConnection->ID, vConnection->IX);
+        if (vConnection->NameU)
             fprintf(file, " NameU='%s'",
-                    vdx_convert_xml_string(Connection->NameU));
+                    vdx_convert_xml_string(vConnection->NameU));
         fprintf(file, ">\n");
         fprintf(file, "%s  <AutoGen>%u</AutoGen>\n", pad,
-                Connection->AutoGen);
+                vConnection->AutoGen);
         fprintf(file, "%s  <DirX>%f</DirX>\n", pad,
-                Connection->DirX);
+                vConnection->DirX);
         fprintf(file, "%s  <DirY>%f</DirY>\n", pad,
-                Connection->DirY);
+                vConnection->DirY);
         fprintf(file, "%s  <Prompt>%s</Prompt>\n", pad,
-                vdx_convert_xml_string(Connection->Prompt));
+                vdx_convert_xml_string(vConnection->Prompt));
         fprintf(file, "%s  <Type>%u</Type>\n", pad,
-                Connection->Type);
+                vConnection->Type);
         fprintf(file, "%s  <X>%f</X>\n", pad,
-                Connection->X);
+                vConnection->X);
         fprintf(file, "%s  <Y>%f</Y>\n", pad,
-                Connection->Y);
+                vConnection->Y);
         break;
 
     case vdx_types_Connects:
@@ -4073,20 +4073,20 @@ vdx_write_object(FILE *file, unsigned int depth, const void *p)
         break;
 
     case vdx_types_Group:
-        Group = (const struct vdx_Group *)(p);
+        vGroup = (const struct vdx_Group *)(p);
         fprintf(file, "%s<Group>\n", pad);
         fprintf(file, "%s  <DisplayMode>%u</DisplayMode>\n", pad,
-                Group->DisplayMode);
+                vGroup->DisplayMode);
         fprintf(file, "%s  <DontMoveChildren>%u</DontMoveChildren>\n", pad,
-                Group->DontMoveChildren);
+                vGroup->DontMoveChildren);
         fprintf(file, "%s  <IsDropTarget>%u</IsDropTarget>\n", pad,
-                Group->IsDropTarget);
+                vGroup->IsDropTarget);
         fprintf(file, "%s  <IsSnapTarget>%u</IsSnapTarget>\n", pad,
-                Group->IsSnapTarget);
+                vGroup->IsSnapTarget);
         fprintf(file, "%s  <IsTextEditTarget>%u</IsTextEditTarget>\n", pad,
-                Group->IsTextEditTarget);
+                vGroup->IsTextEditTarget);
         fprintf(file, "%s  <SelectMode>%u</SelectMode>\n", pad,
-                Group->SelectMode);
+                vGroup->SelectMode);
         break;
 
     case vdx_types_HeaderFooter:
@@ -4949,7 +4949,7 @@ vdx_write_object(FILE *file, unsigned int depth, const void *p)
         break;
 
     case vdx_types_Text:
-        Text = (const struct vdx_Text *)(p);
+        vText = (const struct vdx_Text *)(p);
         fprintf(file, "%s<Text>", pad);
         *pad = 0;
         break;