diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2019-05-06 19:31:29 +0200 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2019-05-06 19:31:29 +0200 |
| commit | d87d181cd692247a5a7411fd6284c862bc73f28b (patch) | |
| tree | 972841900bfc329708f8c8bb6ea76d9cf4b27385 /qfile.c | |
| parent | qdepends: use q_vdb_get_atom instead of constructing manually (diff) | |
| download | portage-utils-d87d181cd692247a5a7411fd6284c862bc73f28b.tar.gz portage-utils-d87d181cd692247a5a7411fd6284c862bc73f28b.tar.bz2 portage-utils-d87d181cd692247a5a7411fd6284c862bc73f28b.zip | |
libq/vdb: drop q_ prefix
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Diffstat (limited to 'qfile.c')
| -rw-r--r-- | qfile.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -74,7 +74,7 @@ struct qfile_opt_state { * We assume the people calling us have chdir(/var/db/pkg) and so * we use relative paths throughout here. */ -static int qfile_cb(q_vdb_pkg_ctx *pkg_ctx, void *priv) +static int qfile_cb(vdb_pkg_ctx *pkg_ctx, void *priv) { struct qfile_opt_state *state = priv; const char *catname = pkg_ctx->cat_ctx->name; @@ -115,14 +115,14 @@ static int qfile_cb(q_vdb_pkg_ctx *pkg_ctx, void *priv) } if (state->exclude_slot == NULL) goto qlist_done; /* "(CAT/)?(PN|PF)" matches, and no SLOT specified */ - q_vdb_pkg_eat(pkg_ctx, "SLOT", &state->buf, &state->buflen); + vdb_pkg_eat(pkg_ctx, "SLOT", &state->buf, &state->buflen); rmspace(state->buf); if (strcmp(state->exclude_slot, state->buf) == 0) goto qlist_done; /* "(CAT/)?(PN|PF):SLOT" matches */ } dont_skip_pkg: /* End of the package exclusion tests. */ - fp = q_vdb_pkg_fopenat_ro(pkg_ctx, "CONTENTS"); + fp = vdb_pkg_fopenat_ro(pkg_ctx, "CONTENTS"); if (fp == NULL) goto qlist_done; @@ -227,7 +227,7 @@ static int qfile_cb(q_vdb_pkg_ctx *pkg_ctx, void *priv) /* XXX: This assumes the buf is big enough. */ char *slot_hack = slot + 1; size_t slot_len = sizeof(slot) - 1; - q_vdb_pkg_eat(pkg_ctx, "SLOT", &slot_hack, &slot_len); + vdb_pkg_eat(pkg_ctx, "SLOT", &slot_hack, &slot_len); rmspace(slot_hack); slot[0] = ':'; } else @@ -479,7 +479,7 @@ int qfile_main(int argc, char **argv) nb_of_queries = prepare_qfile_args(argc, (const char **) argv, &state); /* Now do the actual `qfile` checking */ if (nb_of_queries > 0) - found += q_vdb_foreach_pkg_sorted(portroot, portvdb, qfile_cb, &state); + found += vdb_foreach_pkg_sorted(portroot, portvdb, qfile_cb, &state); if (state.args.non_orphans) { /* display orphan files */ |