X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/98d285b2abc68892fcf3f0a48a37cfccabd5038c..efc068f39f6811cdc0e004d2acf4ef08b2b71c3e:/src/lbx.h

diff --git a/src/lbx.h b/src/lbx.h
index 329bf09..410d829 100644
--- a/src/lbx.h
+++ b/src/lbx.h
@@ -3,20 +3,9 @@
 
 #include <stdio.h>
 
-/* Errors */
-enum {
-	LBX_ESUCCESS,
-	LBX_EMAGIC,
-	LBX_EEOF,
-	LBX_ERANGE,
-	LBX_EFORMAT,
-};
-extern int lbx_errno;
-
 struct lbx_file_ops {
 	size_t (*read)(void *buf, size_t size, void *handle);
 	int    (*seek)(void *handle, long offset, int whence);
-	long   (*tell)(void *handle);
 	int    (*eof) (void *handle);
 };
 
@@ -31,34 +20,34 @@ extern const struct lbx_file_ops lbx_default_fops;
 /* I/O operations for un-seekable files (e.g. pipes). */
 extern const struct lbx_file_ops lbx_pipe_fops;
 
+/* I/O operations for LBX archive members. */
+extern const struct lbx_file_ops lbx_arch_fops;
+
 /* Opaque */
-typedef struct lbx_state LBX;
 typedef struct lbx_file_state LBXfile;
 
+struct lbx {
+	unsigned nfiles;
+};
+
 struct lbx_statbuf {
 	const char *name;
 	size_t size;
 };
 
 /* Archive operations */
-LBX   *lbx_open(void *handle, const struct lbx_file_ops *fops,
-                int (*destructor)(void *handle), const char *name);
-LBX   *lbx_fopen(FILE *, const char *);
-LBX   *lbx_mopen(void *, size_t, const char *);
-int    lbx_close(LBX *);
-size_t lbx_numfiles(LBX *);
+struct lbx *lbx_open(void *handle, const struct lbx_file_ops *fops,
+                     int (*destructor)(void *handle), const char *name);
+struct lbx *lbx_fopen(const char *);
+int lbx_close(struct lbx *);
 
 /* File operations */
-int      lbx_stat(LBX *, size_t, struct lbx_statbuf *);
-
-LBXfile *lbx_file_open(LBX *lbx, unsigned fileno);
+int      lbx_file_stat(struct lbx *lbx, unsigned fileno, struct lbx_statbuf *out);
+LBXfile *lbx_file_open(struct lbx *lbx, unsigned fileno);
 size_t   lbx_file_read(LBXfile *f, void *buf, size_t n);
 int      lbx_file_seek(LBXfile *f, long offset, int whence);
 long     lbx_file_tell(LBXfile *f);
 int      lbx_file_eof(LBXfile *f);
 void     lbx_file_close(LBXfile *f);
 
-/* Misc operations */
-const char *lbx_strerror(void);
-
 #endif