liblbx: Kill the LBX typedef.

[liblbx.git] / src / lbxtool.c

diff --git a/src/lbxtool.c b/src/lbxtool.c
index 9c4b57bbf623d6dafaa45f76084b964db07703d8..b20766648537ec419934e9431db34b4e54854547 100644 (file)
--- a/src/lbxtool.c
+++ b/src/lbxtool.c
@@ -69,16 +69,15 @@ int filematch(char **argv, const char *name)
        return i ? -1: 0;
 }
 
-int list(LBX *lbx, int verbose, char **argv) {
-       size_t nfiles;
+int list(struct lbx *lbx, int verbose, char **argv)
+{
        unsigned int i;
 
-       nfiles = lbx_numfiles(lbx);
        if (verbose) {
-               printf("Files in archive: %zu\n", nfiles);
+               printf("Files in archive: %u\n", lbx->nfiles);
        }
 
-       for (i = 0; i < nfiles; i++) {
+       for (i = 0; i < lbx->nfiles; i++) {
                struct lbx_statbuf stat;
 
                lbx_file_stat(lbx, i, &stat);
@@ -143,16 +142,15 @@ int extract_file(LBXfile *f, const struct lbx_statbuf *stat)
        return ret;
 }
 
-int extract(LBX *lbx, int verbose, char **argv) {
-       size_t nfiles;
+int extract(struct lbx *lbx, int verbose, char **argv)
+{
        unsigned int i;
 
-       nfiles = lbx_numfiles(lbx);
        if (verbose) {
-               printf("Files in archive: %zu\n", nfiles);
+               printf("Files in archive: %u\n", lbx->nfiles);
        }
 
-       for (i = 0; i < nfiles; i++) {
+       for (i = 0; i < lbx->nfiles; i++) {
                struct lbx_statbuf stat;
                LBXfile *file;
 
@@ -183,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[] = {