From 1ac4f49c6492354367dd243458892fbdc7765f2b Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Fri, 13 May 2011 21:12:13 -0400 Subject: [PATCH] liblbx: Kill the LBX typedef. More stuff rendered redundant. --- src/gui/lbxgui.c | 4 ++-- src/lbx.h | 15 +++++++-------- src/lbxtool.c | 6 +++--- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/gui/lbxgui.c b/src/gui/lbxgui.c index e230d6f..bdc1d50 100644 --- a/src/gui/lbxgui.c +++ b/src/gui/lbxgui.c @@ -179,7 +179,7 @@ static int close_image(void *handle) return 0; } -static LBXimg *load_lbx_image(LBX *archive, unsigned index) +static LBXimg *load_lbx_image(struct lbx *archive, unsigned index) { LBXfile *file; LBXimg *image; @@ -317,7 +317,7 @@ static int load_archive(const char *path) gchar *basename; GtkTreeIter iter1, iter2; unsigned nfiles; - LBX *lbx; + struct lbx *lbx; lbx = lbx_fopen(path); if (!lbx) diff --git a/src/lbx.h b/src/lbx.h index 0f09c06..1ad0493 100644 --- a/src/lbx.h +++ b/src/lbx.h @@ -25,7 +25,6 @@ extern const struct lbx_file_ops lbx_pipe_fops; extern const struct lbx_file_ops lbx_arch_fops; /* Opaque */ -typedef struct lbx LBX; typedef struct lbx_file_state LBXfile; struct lbx { @@ -38,15 +37,15 @@ struct lbx_statbuf { }; /* Archive operations */ -LBX *lbx_open(void *handle, const struct lbx_file_ops *fops, - int (*destructor)(void *handle), const char *name); -LBX *lbx_fopen(const char *); -LBX *lbx_mopen(void *, size_t, const char *); -int lbx_close(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 *); +struct lbx *lbx_mopen(void *, size_t, const char *); +int lbx_close(struct lbx *); /* File operations */ -int lbx_file_stat(LBX *lbx, unsigned fileno, struct lbx_statbuf *out); -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); diff --git a/src/lbxtool.c b/src/lbxtool.c index 8a5a428..b207666 100644 --- a/src/lbxtool.c +++ b/src/lbxtool.c @@ -69,7 +69,7 @@ int filematch(char **argv, const char *name) return i ? -1: 0; } -int list(LBX *lbx, int verbose, char **argv) +int list(struct lbx *lbx, int verbose, char **argv) { unsigned int i; @@ -142,7 +142,7 @@ int extract_file(LBXfile *f, const struct lbx_statbuf *stat) return ret; } -int extract(LBX *lbx, int verbose, char **argv) +int extract(struct lbx *lbx, int verbose, char **argv) { unsigned int i; @@ -181,7 +181,7 @@ int main(int argc, char **argv) int mode = MODE_NONE, verbose = 0, opt, rc = EXIT_FAILURE; struct lbx_pipe_state stdin_handle = { .f = stdin }; const char *file = NULL; - LBX *lbx; + struct lbx *lbx; static const char *sopts = "lxf:i:vV"; static const struct option lopts[] = { -- 2.43.0