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

xbps_handle: remove debug, install_*, syslog_enabled members.

Browse Source 
Replaced by definitions that can be set to xbps_handle::flags.
This commit is contained in:
Juan RP
2012-01-22 10:52:35 +01:00
parent c884634a62
commit 791f1d40b2
9 changed files with 70 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/initend.c
View File

@@ -40,6 +40,7 @@
* using libxbps and finalize usage to release resources at the end.
*/
static bool debug;
static bool syslog_enabled;
static bool xbps_initialized;
static struct xbps_handle *xhp;
@@ -109,7 +110,8 @@ xbps_init(struct xbps_handle *xh)
assert(xh != NULL);
xhp = xh;
debug = xhp->debug;
if (xhp->flags & XBPS_FLAG_DEBUG)
debug = true;
if (xhp->conffile == NULL)
xhp->conffile = XBPS_CONF_DEF;
@@ -161,19 +163,24 @@ xbps_init(struct xbps_handle *xh)
xhp->cachedir = xhp->cachedir_priv;
if (xhp->cfg == NULL) {
xhp->syslog_enabled = true;
xhp->flags |= XBPS_FLAG_SYSLOG;
xhp->fetch_timeout = XBPS_FETCH_TIMEOUT;
xhp->transaction_frequency_flush = XBPS_TRANS_FLUSH;
cc = XBPS_FETCH_CACHECONN;
cch = XBPS_FETCH_CACHECONN_HOST;
} else {
xhp->syslog_enabled = cfg_getbool(xhp->cfg, "syslog");
syslog_enabled = cfg_getbool(xhp->cfg, "syslog");
if (syslog_enabled)
xhp->flags |= XBPS_FLAG_SYSLOG;
xhp->fetch_timeout = cfg_getint(xhp->cfg, "FetchTimeoutConnection");
cc = cfg_getint(xhp->cfg, "FetchCacheConnections");
cch = cfg_getint(xhp->cfg, "FetchCacheConnectionsPerHost");
xhp->transaction_frequency_flush =
cfg_getint(xhp->cfg, "TransactionFrequencyFlush");
}
if (!syslog_enabled && (xhp->flags & XBPS_FLAG_SYSLOG))
syslog_enabled = true;
xbps_fetch_set_cache_connection(cc, cch);
xbps_dbg_printf("Rootdir=%s\n", xhp->rootdir);
@@ -181,7 +188,7 @@ xbps_init(struct xbps_handle *xh)
xbps_dbg_printf("FetchTimeout=%u\n", xhp->fetch_timeout);
xbps_dbg_printf("FetchCacheconn=%u\n", cc);
xbps_dbg_printf("FetchCacheconnHost=%u\n", cch);
xbps_dbg_printf("Syslog=%u\n", xhp->syslog_enabled);
xbps_dbg_printf("Syslog=%u\n", syslog_enabled);
xbps_dbg_printf("TransactionFrequencyFlush=%u\n",
xhp->transaction_frequency_flush);

4
lib/package_register.c
View File

@@ -97,9 +97,9 @@ xbps_register_pkg(prop_dictionary_t pkgrd, bool flush)
goto out;
}
prop_dictionary_get_bool(pkgd, "automatic-install", &autoinst);
if (xhp->install_reason_auto)
if (xhp->flags & XBPS_FLAG_INSTALL_AUTO)
autoinst = true;
else if (xhp->install_reason_manual)
else if (xhp->flags & XBPS_FLAG_INSTALL_MANUAL)
autoinst = false;
if (!prop_dictionary_set_bool(pkgd,

6
lib/repository_finddeps.c
View File

@@ -71,7 +71,7 @@ store_dependency(prop_dictionary_t transd,
if (!prop_array_add(array, repo_pkgd))
return EINVAL;
if (xhp->debug) {
if (xhp->flags & XBPS_FLAG_DEBUG) {
xbps_dbg_printf_append("\n");
xbps_dbg_printf(" ");
for (x = 0; x < *depth; x++)
@@ -211,7 +211,7 @@ find_repo_deps(prop_dictionary_t transd, /* transaction dictionary */
rv = EINVAL;
break;
}
if (xhp->debug) {
if (xhp->flags & XBPS_FLAG_DEBUG) {
xbps_dbg_printf("");
for (x = 0; x < *depth; x++)
xbps_dbg_printf_append(" ");
@@ -419,7 +419,7 @@ find_repo_deps(prop_dictionary_t transd, /* transaction dictionary */
continue;
}
prop_object_release(curpkgd);
if (xhp->debug) {
if (xhp->flags & XBPS_FLAG_DEBUG) {
xbps_dbg_printf("");
for (x = 0; x < *depth; x++)
xbps_dbg_printf_append(" ");