Stop using gnulib's flexmember module.

[upkg.git] / src / uobject / exportable.c

diff --git a/src/uobject/exportable.c b/src/uobject/exportable.c
index 3d94cec3e6b7239e361596a2b886fa6ea2917949..6e75f252bfd64c5a33bf33281382d407737885e3 100644 (file)
--- a/src/uobject/exportable.c
+++ b/src/uobject/exportable.c
@@ -1,31 +1,31 @@
 /*
- *  upkg: tool for manipulating Unreal Tournament packages.
- *  Copyright (C) 2009 Nick Bowler
+ * upkg: tool for manipulating Unreal Tournament packages.
+ * Copyright © 2009-2011, 2022 Nick Bowler
  *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdio.h>
-#include <glib-object.h>
-#include <uobject/exportable.h>
+#include "exportable.h"
 
 GType u_object_exportable_get_type(void)
 {
        static GType type = 0;
        if (type == 0) {
                static const GTypeInfo info = {
-                       sizeof (UObjectExportable),
+                       sizeof (UObjectExportableIface),
                        NULL,
                        NULL,
                };
@@ -36,14 +36,20 @@ GType u_object_exportable_get_type(void)
        return type;
 }
 
-int u_object_export(GObject *obj, FILE *f)
+int u_object_export(GObject *go, FILE *f)
 {
-       g_return_val_if_fail(U_OBJECT_IS_EXPORTABLE(obj), -1);
-       return U_OBJECT_EXPORTABLE_GET_INTERFACE(obj)->export(obj, f);
+       g_return_val_if_fail(IS_U_OBJECT(go), -1);
+       g_return_val_if_fail(U_OBJECT_IS_EXPORTABLE(go), -1);
+       UObject *uo = U_OBJECT(go);
+
+       return U_OBJECT_EXPORTABLE_GET_INTERFACE(go)->export(uo, f);
 }
 
-int u_object_export_name(GObject *obj, char *buf, size_t n)
+int u_object_export_name(GObject *go, char *buf, size_t n)
 {
-       g_return_val_if_fail(U_OBJECT_IS_EXPORTABLE(obj), -1);
-       return U_OBJECT_EXPORTABLE_GET_INTERFACE(obj)->export_name(obj, buf, n);
+       g_return_val_if_fail(IS_U_OBJECT(go), -1);
+       g_return_val_if_fail(U_OBJECT_IS_EXPORTABLE(go), -1);
+       UObject *uo = U_OBJECT(go);
+
+       return U_OBJECT_EXPORTABLE_GET_INTERFACE(go)->export_name(uo, buf, n);
 }