mirror of
https://github.com/moparisthebest/pacman
synced 2024-12-23 16:28:50 -05:00
a32ca90192
Remove the logmask functionality from the backend as it has been moved to the frontend, and change the logging callback function to use pm_printf. In addition, make much better use of va_list- use the args list instead of a arbitrarily chosen string to print to in the logging functions. Signed-off-by: Dan McGee <dan@archlinux.org>
89 lines
2.2 KiB
C
89 lines
2.2 KiB
C
/*
|
|
* log.c
|
|
*
|
|
* Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
|
* USA.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <stdio.h>
|
|
#include <stdarg.h>
|
|
#include <time.h>
|
|
|
|
/* libalpm */
|
|
#include "log.h"
|
|
#include "handle.h"
|
|
#include "util.h"
|
|
#include "error.h"
|
|
#include "alpm.h"
|
|
|
|
/** \addtogroup alpm_log Logging Functions
|
|
* @brief Functions to log using libalpm
|
|
* @{
|
|
*/
|
|
|
|
/** A printf-like function for logging.
|
|
* @param fmt output format
|
|
* @return 0 on success, -1 on error (pm_errno is set accordingly)
|
|
*/
|
|
int SYMEXPORT alpm_logaction(char *fmt, ...)
|
|
{
|
|
int ret;
|
|
va_list args;
|
|
|
|
ALPM_LOG_FUNC;
|
|
|
|
/* Sanity checks */
|
|
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
|
|
|
|
va_start(args, fmt);
|
|
ret = _alpm_logaction(handle->usesyslog, handle->logfd, fmt, args);
|
|
va_end(args);
|
|
|
|
/* TODO We should add a prefix to log strings depending on who called us.
|
|
* If logaction was called by the frontend:
|
|
* USER: <the frontend log>
|
|
* and if called internally:
|
|
* ALPM: <the library log>
|
|
* Moreover, the frontend should be able to choose its prefix
|
|
* (USER by default?):
|
|
* pacman: "PACMAN"
|
|
* kpacman: "KPACMAN"
|
|
* This would allow us to share the log file between several frontends
|
|
* and know who does what */
|
|
return(ret);
|
|
}
|
|
|
|
/** @} */
|
|
|
|
void _alpm_log(pmloglevel_t flag, char *fmt, ...)
|
|
{
|
|
va_list args;
|
|
alpm_cb_log logcb = alpm_option_get_logcb();
|
|
|
|
if(logcb == NULL) {
|
|
return;
|
|
}
|
|
|
|
va_start(args, fmt);
|
|
logcb(flag, fmt, args);
|
|
va_end(args);
|
|
}
|
|
|
|
/* vim: set ts=2 sw=2 noet: */
|