emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libxbps: require a pointer to xbps_handle in functions that need it.

Browse Source 
This removes 2 global vars from lib/initend.c and easier to know
what functions require access to xbps_handle.
This commit is contained in:
Juan RP
2012-06-14 08:22:11 +02:00
parent a3adbcda95
commit 3e9e87fc2a
60 changed files with 1143 additions and 901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bin/xbps-dgraph/main.c
View File

@@ -94,7 +94,6 @@ die(const char *fmt, ...)
vfprintf(stderr, fmt, ap);
fprintf(stderr, " (%s)\n", strerror(save_errno));
va_end(ap);
xbps_end();
exit(EXIT_FAILURE);
}
@@ -357,7 +356,8 @@ parse_array_in_pkg_dictionary(FILE *f, prop_dictionary_t plistd,
}
static void
create_dot_graph(FILE *f,
create_dot_graph(struct xbps_handle *xhp,
FILE *f,
prop_dictionary_t plistd,
prop_dictionary_t confd,
bool revdeps)
@@ -422,7 +422,7 @@ create_dot_graph(FILE *f,
* list file, aka XBPS_META_PATH/XBPS_PKGDB.
*/
if (revdeps) {
regpkgd = xbps_find_pkg_dict_installed(pkgn, false);
regpkgd = xbps_find_pkg_dict_installed(xhp, pkgn, false);
if (regpkgd == NULL)
die("cannot find '%s' dictionary on %s!",
pkgn, XBPS_PKGDB);
@@ -515,7 +515,7 @@ main(int argc, char **argv)
/*
* Internalize the plist file of the target installed package.
*/
plistd = xbps_dictionary_from_metadata_plist(argv[0], XBPS_PKGPROPS);
plistd = xbps_dictionary_from_metadata_plist(&xh, argv[0], XBPS_PKGPROPS);
if (plistd == NULL)
die("cannot internalize %s from %s", XBPS_PKGPROPS, argv[0]);
@@ -528,10 +528,11 @@ main(int argc, char **argv)
/*
* Create the dot(1) graph!
*/
create_dot_graph(f, plistd, confd, revdeps);
create_dot_graph(&xh, f, plistd, confd, revdeps);
prop_object_release(plistd);
prop_object_release(confd);
xbps_end(&xh);
exit(EXIT_SUCCESS);
}