upkg: Add support for controlling which package is acted upon.

[upkg.git] / src / libupkg.c

diff --git a/src/libupkg.c b/src/libupkg.c
index 004cb4669fa7c64ab02a836406badaba590f86a0..40b39136f4c3164f22732a73e33adba2b1fae65e 100644 (file)
--- a/src/libupkg.c
+++ b/src/libupkg.c
@@ -61,27 +61,27 @@ struct upkg_private {
 /* Default I/O operations for ordinary files. */
 static size_t file_read(void *buf, size_t size, void *handle)
 {
-       return fread(buf, 1, size, handle);
+       return fread(buf, 1, size, (FILE *)handle);
 }
 
 static int file_seek(void *handle, long offset, int whence)
 {
-       return fseek(handle, offset, whence);
+       return fseek((FILE *)handle, offset, whence);
 }
 
 static long file_tell(void *handle)
 {
-       return ftell(handle);
+       return ftell((FILE *)handle);
 }
 
 static int file_eof(void *handle)
 {
-       return feof(handle);
+       return feof((FILE *)handle);
 }
 
 static int file_close(void *handle)
 {
-       return fclose(handle);
+       return fclose((FILE *)handle);
 }
 
 const struct upkg_file_ops upkg_default_fops = {
@@ -357,12 +357,12 @@ static int pkg_init_imports(struct upkg *pkg)
 
                len = 0;
                rc = upkg_decode_index(&tmp, buf+len, nbuf-len);
-               if (rc == 0 || len < 0 || len >= pkg->name_count) goto err;
+               if (rc == 0 || len >= pkg->name_count) goto err;
                import->class_package = pkg->priv->names[tmp].name;
                len += rc;
 
                rc = upkg_decode_index(&tmp, buf+len, nbuf-len);
-               if (rc == 0 || len < 0 || len >= pkg->name_count) goto err;
+               if (rc == 0 || len >= pkg->name_count) goto err;
                import->class_name = pkg->priv->names[tmp].name;
                len += rc;
 
@@ -371,7 +371,7 @@ static int pkg_init_imports(struct upkg *pkg)
                len += 4;
 
                rc = upkg_decode_index(&tmp, buf+len, nbuf-len);
-               if (rc == 0 || len < 0 || len >= pkg->name_count) goto err;
+               if (rc == 0 || len >= pkg->name_count) goto err;
                import->object_name = pkg->priv->names[tmp].name;
                len += rc;