videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-09-04 09:11:33 +02:00
Code Releases Activity

console: avoid integer to pointer conversion

Browse Source
This commit is contained in:
Rémi Denis-Courmont 2018-11-20 21:32:19 +02:00
parent be34b3e329
commit bba70b6543
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/logger/console.c
View File

@ -33,6 +33,7 @@
static const int ptr_width = 2 * /* hex digits */ sizeof (uintptr_t);
static const char msg_type[4][9] = { "", " error", " warning", " debug" };
static char verbosities[VLC_MSG_DBG];
#ifdef __OS2__
#include <vlc_charset.h>
@ -74,7 +75,7 @@ static void LogConsoleColor(void *opaque, int type, const vlc_log_t *meta,
const char *format, va_list ap)
{
FILE *stream = stderr;
int verbose = (intptr_t)opaque;
int verbose = (char *)opaque - verbosities;
if (verbose < type)
return;
@ -105,7 +106,7 @@ static void LogConsoleGray(void *opaque, int type, const vlc_log_t *meta,
const char *format, va_list ap)
{
FILE *stream = stderr;
int verbose = (intptr_t)opaque;
int verbose = (char *)opaque - verbosities;
if (verbose < type)
return;
@ -130,7 +131,8 @@ static const struct vlc_logger_operations gray_ops =
NULL
};
static const struct vlc_logger_operations *Open(vlc_object_t *obj, void **sysp)
static const struct vlc_logger_operations *Open(vlc_object_t *obj,
void **restrict sysp)
{
int verbosity = -1;
@ -147,7 +149,10 @@ static const struct vlc_logger_operations *Open(vlc_object_t *obj, void **sysp)
return NULL;
verbosity += VLC_MSG_ERR;
*sysp = (void *)(uintptr_t)verbosity;
if (verbosity > VLC_MSG_DBG)
verbosity = VLC_MSG_DBG;
*sysp = verbosities + verbosity;
#if defined (HAVE_ISATTY) && !defined (_WIN32)
if (isatty(STDERR_FILENO) && var_InheritBool(obj, "color"))