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

pkg: parse_file is now pkg_new_from_file

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

2
parse.c
View File

@ -320,7 +320,7 @@ pkg_dependency_parse(pkg_t *pkg, const char *depends)
* Parse a .pc file into a pkg_t object structure. * Parse a .pc file into a pkg_t object structure.
*/ */
pkg_t * pkg_t *
parse_file(const char *filename, FILE *f) pkg_new_from_file(const char *filename, FILE *f)
{ {
pkg_t *pkg; pkg_t *pkg;
char readbuf[BUFSIZ]; char readbuf[BUFSIZ];

10
pkg.c
View File

@ -142,7 +142,7 @@ pkg_find(const char *name, unsigned int flags)
if (str_has_suffix(name, PKG_CONFIG_EXT)) if (str_has_suffix(name, PKG_CONFIG_EXT))
{ {
if ((f = fopen(name, "r")) != NULL) if ((f = fopen(name, "r")) != NULL)
return parse_file(name, f); return pkg_new_from_file(name, f);
} }
/* PKG_CONFIG_PATH has to take precedence */ /* PKG_CONFIG_PATH has to take precedence */
@ -158,7 +158,7 @@ pkg_find(const char *name, unsigned int flags)
if (!(flags & PKGF_NO_UNINSTALLED) && (f = fopen(uninst_locbuf, "r")) != NULL) if (!(flags & PKGF_NO_UNINSTALLED) && (f = fopen(uninst_locbuf, "r")) != NULL)
{ {
pkg = parse_file(locbuf, f); pkg = pkg_new_from_file(locbuf, f);
pkg->uninstalled = true; pkg->uninstalled = true;
goto out; goto out;
@ -166,7 +166,7 @@ pkg_find(const char *name, unsigned int flags)
if ((f = fopen(locbuf, "r")) != NULL) if ((f = fopen(locbuf, "r")) != NULL)
{ {
pkg = parse_file(locbuf, f); pkg = pkg_new_from_file(locbuf, f);
goto out; goto out;
} }
@ -190,7 +190,7 @@ pkg_find(const char *name, unsigned int flags)
if (!(flags & PKGF_NO_UNINSTALLED) && (f = fopen(uninst_locbuf, "r")) != NULL) if (!(flags & PKGF_NO_UNINSTALLED) && (f = fopen(uninst_locbuf, "r")) != NULL)
{ {
pkg_t *pkg = parse_file(locbuf, f); pkg_t *pkg = pkg_new_from_file(locbuf, f);
pkg->uninstalled = true; pkg->uninstalled = true;
goto out; goto out;
@ -198,7 +198,7 @@ pkg_find(const char *name, unsigned int flags)
if ((f = fopen(locbuf, "r")) != NULL) if ((f = fopen(locbuf, "r")) != NULL)
{ {
pkg = parse_file(locbuf, f); pkg = pkg_new_from_file(locbuf, f);
goto out; goto out;
} }

2
pkg.h
View File

@ -144,7 +144,7 @@ pkg_t *pkg_verify_dependency(pkg_dependency_t *pkgdep, unsigned int flags, unsig
const char *pkg_get_comparator(pkg_dependency_t *pkgdep); const char *pkg_get_comparator(pkg_dependency_t *pkgdep);
/* parse.c */ /* parse.c */
pkg_t *parse_file(const char *path, FILE *f); pkg_t *pkg_new_from_file(const char *path, FILE *f);
pkg_dependency_t *pkg_dependency_parse(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);