Disable deprecation warnings from Glib.

[upkg.git] / src / libupkg.c

diff --git a/src/libupkg.c b/src/libupkg.c
index acbf80f49c00bbf46cd9ae970ce8aef2c08ada29..ed652ac9fdd6e0cd0e39ae2cb087cdf09d56fd87 100644 (file)
--- a/src/libupkg.c
+++ b/src/libupkg.c
@@ -1,21 +1,22 @@
 /*
- *  upkg: tool for manipulating Unreal Tournament packages.
- *  Copyright © 2009-2011 Nick Bowler
+ * upkg: tool for manipulating Unreal Tournament packages.
+ * Copyright © 2009-2012, 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 <stdlib.h>
 #include <string.h>
@@ -46,7 +47,7 @@ struct upkg_name {
 struct upkg_export_priv {
        struct upkg_export pub;
 
-       long class, super;
+       long super;
        unsigned long size, offset;
 };
 
@@ -271,7 +272,6 @@ static int pkg_init_exports(struct upkg_priv *pkg)
 
        while (index < pkg->pub.export_count) {
                struct upkg_export_priv *export = &pkg->exports[index];
-               unsigned long parent_index;
                long tmp;
 
                /* Read some data into buffer. */
@@ -283,7 +283,7 @@ static int pkg_init_exports(struct upkg_priv *pkg)
                }
 
                len = 0;
-               rc = upkg_decode_index(&export->class, buf+len, nbuf-len);
+               rc = upkg_decode_index(&export->pub.class, buf+len, nbuf-len);
                if (rc == 0) goto err;
                len += rc;
 
@@ -292,15 +292,17 @@ static int pkg_init_exports(struct upkg_priv *pkg)
                len += rc;
 
                if (nbuf-len < 4) goto err;
-               parent_index = unpack_32_le(buf+len);
+               tmp = unpack_s32_le(buf+len);
+               if (tmp < 0)
+                       goto err;
                len += 4;
 
                export->pub.parent = NULL;
-               if (parent_index > 0) {
-                       parent_index--;
-                       if (parent_index >= pkg->pub.export_count)
+               if (tmp > 0) {
+                       tmp--;
+                       if (tmp >= pkg->pub.export_count)
                                goto err;
-                       export->pub.parent = &pkg->exports[parent_index].pub;
+                       export->pub.parent = &pkg->exports[tmp].pub;
                }
 
                rc = upkg_decode_index(&tmp, buf+len, nbuf-len);
@@ -532,47 +534,13 @@ const struct upkg_export *upkg_get_export(struct upkg *pub, unsigned long idx)
        return NULL;
 }
 
-const char *upkg_export_class(struct upkg *pub, unsigned long idx,
-                              const char **package)
+const struct upkg_import *upkg_get_import(struct upkg *pub, unsigned long idx)
 {
        struct upkg_priv *pkg = (struct upkg_priv *)pub;
-       const struct upkg_import *iclass, *ipackage;
-       struct upkg_export_priv *export;
-       unsigned long pkg_idx;
-
-       if (idx >= pkg->pub.export_count)
-               return NULL;
-
-       export = &pkg->exports[idx];
-
-       /* Assumption: class references are always imports. */
-       format_assert(export->class <= 0, return NULL);
-
-       /* Get the class. */
-       if (export->class == 0) {
-               if (package) *package = "Core";
-               return "Class";
-       }
-
-       pkg_idx = -(export->class + 1);
-       if (pkg_idx >= pkg->pub.import_count)
-               return NULL;
-       iclass = &pkg->imports[pkg_idx];
-
-       /* Assumption: class references are always Core.Class. */
-       format_assert(!strcmp(iclass->class_package, "Core"), return NULL);
-       format_assert(!strcmp(iclass->class_name, "Class"), return NULL);
 
-       ipackage = iclass->parent;
-       if (!ipackage)
-               return NULL;
-
-       /* Assumption: package references are always Core.Package. */
-       format_assert(!strcmp(ipackage->class_package, "Core"), return NULL);
-       format_assert(!strcmp(ipackage->class_name, "Package"), return NULL);
-
-       if (package) *package = ipackage->name;
-       return iclass->name;
+       if (idx < pkg->pub.import_count)
+               return &pkg->imports[idx];
+       return NULL;
 }
 
 struct upkg_file *upkg_export_open(struct upkg *pub, unsigned long idx)