External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop unused return value of virLogOutputFunc

Browse Source 
Nothing uses the return value, and creating it requries otherwise
unnecessary strlen () calls.

This cleanup is conceptually independent from the rest of the series
(although the later patches won't apply without it).  This just seems
a good opportunity to clean this up, instead of entrenching the unnecessary
return value in the virLogOutputFunc instance that will be added in this
series.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač 2012-09-20 20:24:00 +02:00 committed by Eric Blake
parent 9ce64e6aae
commit fca338a06c
3 changed files with 34 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/util/logging.c
View File

@ -98,7 +98,7 @@ static virLogPriority virLogDefaultPriority = VIR_LOG_DEFAULT;
static int virLogResetFilters(void);
static int virLogResetOutputs(void);
static int virLogOutputToFd(const char *category, int priority,
static void virLogOutputToFd(const char *category, int priority,
const char *funcname, long long linenr,
const char *timestamp,
unsigned int flags,
@ -807,7 +807,7 @@ static void virLogStackTraceToFd(int fd)
#undef STRIP_DEPTH
}
static int virLogOutputToFd(const char *category ATTRIBUTE_UNUSED,
static void virLogOutputToFd(const char *category ATTRIBUTE_UNUSED,
int priority ATTRIBUTE_UNUSED,
const char *funcname ATTRIBUTE_UNUSED,
long long linenr ATTRIBUTE_UNUSED,
@ -817,22 +817,19 @@ static int virLogOutputToFd(const char *category ATTRIBUTE_UNUSED,
void *data)
{
int fd = (intptr_t) data;
int ret;
char *msg;
if (fd < 0)
return -1;
return;
if (virAsprintf(&msg, "%s: %s", timestamp, str) < 0)
return -1;
return;
ret = safewrite(fd, msg, strlen(msg));
ignore_value(safewrite(fd, msg, strlen(msg)));
VIR_FREE(msg);
if (flags & VIR_LOG_STACK_TRACE)
virLogStackTraceToFd(fd);
return ret;
}
static void virLogCloseFd(void *data)
@ -865,7 +862,7 @@ static int virLogAddOutputToFile(int priority, const char *file) {
}
#if HAVE_SYSLOG_H
static int virLogOutputToSyslog(const char *category ATTRIBUTE_UNUSED,
static void virLogOutputToSyslog(const char *category ATTRIBUTE_UNUSED,
int priority,
const char *funcname ATTRIBUTE_UNUSED,
long long linenr ATTRIBUTE_UNUSED,
@ -876,7 +873,7 @@ static int virLogOutputToSyslog(const char *category ATTRIBUTE_UNUSED,
{
int prio;
virCheckFlags(VIR_LOG_STACK_TRACE, -1);
virCheckFlags(VIR_LOG_STACK_TRACE,);
switch (priority) {
case VIR_LOG_DEBUG:
@ -895,7 +892,6 @@ static int virLogOutputToSyslog(const char *category ATTRIBUTE_UNUSED,
prio = LOG_ERR;
}
syslog(prio, "%s", str);
return strlen(str);
}
static char *current_ident = NULL;

4
src/util/logging.h
View File

@ -94,10 +94,8 @@ typedef enum {
* @data: extra output logging data
*
* Callback function used to output messages
*
* Returns the number of bytes written or -1 in case of error
*/
typedef int (*virLogOutputFunc) (const char *category, int priority,
typedef void (*virLogOutputFunc) (const char *category, int priority,
const char *funcname, long long linenr,
const char *timestamp,
unsigned int flags,

5
tests/testutils.c
View File

@ -478,7 +478,7 @@ struct virtTestLogData {
static struct virtTestLogData testLog = { VIR_BUFFER_INITIALIZER };
static int
static void
virtTestLogOutput(const char *category ATTRIBUTE_UNUSED,
int priority ATTRIBUTE_UNUSED,
const char *funcname ATTRIBUTE_UNUSED,
@ -489,9 +489,8 @@ virtTestLogOutput(const char *category ATTRIBUTE_UNUSED,
void *data)
{
struct virtTestLogData *log = data;
virCheckFlags(VIR_LOG_STACK_TRACE, -1);
virCheckFlags(VIR_LOG_STACK_TRACE,);
virBufferAsprintf(&log->buf, "%s: %s", timestamp, str);
return strlen(timestamp) + 2 + strlen(str);
}
static void