uobject: Make module loader understand exports/imports.

[upkg.git] / src / upkg.h

diff --git a/src/upkg.h b/src/upkg.h
index 2885643b269cede5a1ea1698a69c1bdfa0e7aa35..d236714f091b0e165d44c91de9ce687cab04ff2c 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,6 +111,7 @@ 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);
 
@@ -115,6 +124,6 @@ int    upkg_export_seek(struct upkg_file *f, long offset, int whence);
 long   upkg_export_tell(struct upkg_file *f);
 void   upkg_export_close(struct upkg_file *f);
 
-size_t upkg_decode_index(long *val, unsigned char *bytes, size_t n);
+size_t upkg_decode_index(long *val, const unsigned char *bytes, size_t n);
 
 #endif