ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

pkg: rename parse_deplist to pkg_dependency_parse

pull/15/head
William Pitcock 2012-05-06 22:23:05 -05:00
parent 1da21bd3b4
commit d07e41c3f9
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main.c
View File

@ -283,7 +283,7 @@ pkg_queue_walk(pkg_queue_t *head)
{ {
pkg_dependency_t *pkgdep; pkg_dependency_t *pkgdep;
pkgdep = parse_deplist(&world, pkgq->package); pkgdep = pkg_dependency_parse(&world, pkgq->package);
world.requires = pkg_dependency_append(world.requires, pkgdep); world.requires = pkg_dependency_append(world.requires, pkgdep);
free(pkgq->package); free(pkgq->package);

10
parse.c
View File

@ -44,7 +44,7 @@ parse_fragment_list(pkg_t *pkg, const char *string)
} }
/* /*
* parse_deplist(pkg, depends) * pkg_dependency_parse(pkg, depends)
* *
* Add requirements to a .pc file. * Add requirements to a .pc file.
* Commas are counted as whitespace, as to allow: * Commas are counted as whitespace, as to allow:
@ -126,7 +126,7 @@ pkg_dependency_free(pkg_dependency_t *head)
} }
pkg_dependency_t * pkg_dependency_t *
parse_deplist(pkg_t *pkg, const char *depends) pkg_dependency_parse(pkg_t *pkg, const char *depends)
{ {
parse_state_t state = OUTSIDE_MODULE; parse_state_t state = OUTSIDE_MODULE;
pkg_dependency_t *deplist = NULL; pkg_dependency_t *deplist = NULL;
@ -368,11 +368,11 @@ parse_file(const char *filename, FILE *f)
else if (!strcasecmp(key, "LIBS.private")) else if (!strcasecmp(key, "LIBS.private"))
pkg->libs_private = parse_fragment_list(pkg, value); pkg->libs_private = parse_fragment_list(pkg, value);
else if (!strcasecmp(key, "Requires")) else if (!strcasecmp(key, "Requires"))
pkg->requires = parse_deplist(pkg, value); pkg->requires = pkg_dependency_parse(pkg, value);
else if (!strcasecmp(key, "Requires.private")) else if (!strcasecmp(key, "Requires.private"))
pkg->requires_private = parse_deplist(pkg, value); pkg->requires_private = pkg_dependency_parse(pkg, value);
else if (!strcasecmp(key, "Conflicts")) else if (!strcasecmp(key, "Conflicts"))
pkg->conflicts = parse_deplist(pkg, value); pkg->conflicts = pkg_dependency_parse(pkg, value);
break; break;
case '=': case '=':
pkg->vars = pkg_tuple_add(pkg->vars, key, value); pkg->vars = pkg_tuple_add(pkg->vars, key, value);

2
pkg.h
View File

@ -145,7 +145,7 @@ const char *pkg_get_comparator(pkg_dependency_t *pkgdep);
/* parse.c */ /* parse.c */
pkg_t *parse_file(const char *path, FILE *f); pkg_t *parse_file(const char *path, FILE *f);
pkg_dependency_t *parse_deplist(pkg_t *pkg, const char *depends); pkg_dependency_t *pkg_dependency_parse(pkg_t *pkg, const char *depends);
pkg_dependency_t *pkg_dependency_append(pkg_dependency_t *head, pkg_dependency_t *tail); pkg_dependency_t *pkg_dependency_append(pkg_dependency_t *head, pkg_dependency_t *tail);
void pkg_dependency_free(pkg_dependency_t *head); void pkg_dependency_free(pkg_dependency_t *head);