libupkg: Kill upkg_export_class.

[upkg.git] / src / upkg.h

diff --git a/src/upkg.h b/src/upkg.h
index 34291b7f7bf18717e6256dfe18441e65b2cca9be..da85a268382cc5473d39a3b9ab1e244eabacff4b 100644 (file)
--- a/src/upkg.h
+++ b/src/upkg.h
@@ -78,10 +78,18 @@ struct upkg {
 };
 
 struct upkg_export {
-       const char *name;
+       const struct upkg_export *parent;
 
+       const char *name;
        unsigned long flags;
-       long package;
+       long class;
+};
+
+struct upkg_import {
+       const struct upkg_import *parent;
+
+       const char *name;
+       const char *class_package, *class_name;
 };
 
 struct upkg_file {
@@ -89,7 +97,7 @@ struct upkg_file {
 
        int eof;
 
-       struct upkg_priv *pkg;
+       struct upkg *pkg;
        unsigned long base, offset, len;
 };
 
@@ -103,12 +111,10 @@ int upkg_close(struct upkg *pkg);
 
 const char *upkg_get_name(struct upkg *pkg, unsigned long idx);
 const struct upkg_export *upkg_get_export(struct upkg *pkg, unsigned long idx);
+const struct upkg_import *upkg_get_import(struct upkg *pkg, unsigned long idx);
 
 long upkg_export_find(struct upkg *pkg, long parent, const char *name);
 
-const char *upkg_export_class(struct upkg *pkg, unsigned long idx,
-                              const char **package);
-
 struct upkg_file *upkg_export_open(struct upkg *pkg, unsigned long idx);
 size_t upkg_export_read(struct upkg_file *f, void *buf, size_t n);
 int    upkg_export_seek(struct upkg_file *f, long offset, int whence);