moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

Removed the "__" prefix from __pm_logcb and __pm_logmask 

Not needed for library internal data
This commit is contained in:
Aurelien Foret 2005-03-16 20:06:11 +00:00
parent 49415cb675
commit b0f613c211
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libalpm/handle.c
View File

@ -37,8 +37,8 @@
#include "handle.h"
/* log */
extern alpm_cb_log __pm_logcb;
extern unsigned char __pm_logmask;
extern alpm_cb_log pm_logcb;
extern unsigned char pm_logmask;
pmhandle_t *handle_new()
{
@ -189,10 +189,10 @@ int handle_set_option(pmhandle_t *handle, unsigned char val, unsigned long data)
_alpm_log(PM_LOG_FLOW2, "PM_OPT_USESYSLOG set to '%d'", handle->usesyslog);
break;
case PM_OPT_LOGCB:
__pm_logcb = (alpm_cb_log)data;
pm_logcb = (alpm_cb_log)data;
break;
case PM_OPT_LOGMASK:
__pm_logmask = (unsigned char)data;
pm_logmask = (unsigned char)data;
_alpm_log(PM_LOG_FLOW2, "PM_OPT_LOGMASK set to '%02x'", (unsigned char)data);
break;
default:
@ -216,8 +216,8 @@ int handle_get_option(pmhandle_t *handle, unsigned char val, long *data)
case PM_OPT_NOUPGRADE: *data = (long)handle->noupgrade; break;
case PM_OPT_IGNOREPKG: *data = (long)handle->ignorepkg; break;
case PM_OPT_USESYSLOG: *data = handle->usesyslog; break;
case PM_OPT_LOGCB: *data = (long)__pm_logcb; break;
case PM_OPT_LOGMASK: *data = __pm_logmask; break;
case PM_OPT_LOGCB: *data = (long)pm_logcb; break;
case PM_OPT_LOGMASK: *data = pm_logmask; break;
default:
PM_RET_ERR(PM_ERR_WRONG_ARGS, -1);
break;

10
lib/libalpm/log.c
View File

@ -28,24 +28,24 @@
/* Internal library log mechanism */
alpm_cb_log __pm_logcb = NULL;
unsigned char __pm_logmask = 0;
alpm_cb_log pm_logcb = NULL;
unsigned char pm_logmask = 0;
void _alpm_log(unsigned char flag, char *fmt, ...)
{
char str[LOG_STR_LEN];
va_list args;
if(__pm_logcb == NULL) {
if(pm_logcb == NULL) {
return;
}
if(flag & __pm_logmask) {
if(flag & pm_logmask) {
va_start(args, fmt);
vsnprintf(str, LOG_STR_LEN, fmt, args);
va_end(args);
__pm_logcb(flag, str);
pm_logcb(flag, str);
}
}