#include "pack.h"
#include "misc.h"
+#include "error.h"
#include "lbx.h"
#define LBX_MAGIC 0x0000fead
#define LBX_HDR_SIZE 8
-int lbx_errno = 0;
-
struct lbx_state {
char *name;
struct lbx_state *lbx;
if (magic != LBX_MAGIC) {
- lbx_errno = -LBX_EMAGIC;
+ lbx_error_raise(LBX_EMAGIC);
return NULL;
}
lbx = malloc(sizeof *lbx + sizeof lbx->offsets[0] * (nfiles+1));
if (!lbx) {
- lbx_errno = -errno;
+ lbx_error_raise(LBX_ENOMEM);
return NULL;
}
dupname = str_dup(name);
if (!dupname) {
- lbx_errno = -errno;
+ lbx_error_raise(LBX_ENOMEM);
goto err;
}
if (fops->read(hdr_buf, sizeof hdr_buf, f) != sizeof hdr_buf) {
- lbx_errno = -errno;
+ if (fops->eof(f))
+ lbx_error_raise(LBX_EEOF);
goto err;
}
unsigned char buf[4];
if (fops->read(buf, sizeof buf, f) != sizeof buf) {
- lbx_errno = -errno;
if (fops->eof(f))
- lbx_errno = LBX_EEOF;
+ lbx_error_raise(LBX_EEOF);
goto err;
}
static char str[256]; /* FIXME */
if (fileno >= lbx->nfiles) {
+ lbx_error_raise(LBX_ENOENT);
buf->name = NULL;
- lbx_errno = LBX_ERANGE;
return -1;
}
struct lbx_file_state *state;
if (fileno >= lbx->nfiles) {
- lbx_errno = LBX_ERANGE;
+ lbx_error_raise(LBX_ENOENT);
return NULL;
}
lbx->last_file = NULL;
if (lbx->fops->seek(lbx->f, lbx->offsets[fileno], SEEK_SET) != 0) {
- lbx_errno = -errno;
return NULL;
}
state = malloc(sizeof *state);
if (!state) {
- lbx_errno = -errno;
+ lbx_error_raise(LBX_ENOMEM);
return NULL;
}
f->lbx->last_file = NULL;
free(f);
}
-
-const char *lbx_strerror(void)
-{
- if (lbx_errno < 0)
- return strerror(-lbx_errno);
-
- switch (lbx_errno) {
- case LBX_ESUCCESS: return "Success";
- case LBX_EMAGIC: return "Bad magic number";
- case LBX_EEOF: return "Unexpected end-of-file";
- case LBX_ERANGE: return "Index out of range";
- case LBX_EFORMAT: return "Invalid file format";
- }
-
- return "Unknown error";
-}