summaryrefslogtreecommitdiff
path: root/src/xine-utils
diff options
context:
space:
mode:
authorFrantišek Dvořák <valtri@civ.zcu.cz>2008-11-20 20:56:19 +0100
committerFrantišek Dvořák <valtri@civ.zcu.cz>2008-11-20 20:56:19 +0100
commitea2b5508e35f5125fd65730822b30bb8895ad87d (patch)
treee03317e974e1bf818ca50904242595fa01db25df /src/xine-utils
parent2ba1e128cbb791cfdb2829895a854bb664018912 (diff)
downloadxine-lib-ea2b5508e35f5125fd65730822b30bb8895ad87d.tar.gz
xine-lib-ea2b5508e35f5125fd65730822b30bb8895ad87d.tar.bz2
Some warning fixes: XINE_FORMAT_SCANF, statics in headers, consts, ...
Add warning flags to the DEBUG_CFLAGS too.
Diffstat (limited to 'src/xine-utils')
-rw-r--r--src/xine-utils/attributes.h6
-rw-r--r--src/xine-utils/monitor.c3
2 files changed, 5 insertions, 4 deletions
diff --git a/src/xine-utils/attributes.h b/src/xine-utils/attributes.h
index 3819818d5..d7a0e2f1e 100644
--- a/src/xine-utils/attributes.h
+++ b/src/xine-utils/attributes.h
@@ -1,7 +1,7 @@
/*
* attributes.h
* Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
- * Copyright (C) 2001-2007 xine developers
+ * Copyright (C) 2001-2008 xine developers
*
* This file was originally part of mpeg2dec, a free MPEG-2 video stream
* decoder.
@@ -72,7 +72,7 @@
# define XINE_SENTINEL
#endif
-#ifdef SUPPORT_ATTRIBUTE_DEPRECATED
+#if defined(SUPPORT_ATTRIBUTE_DEPRECATED) && !defined(XINE_COMPILE)
# define XINE_DEPRECATED __attribute__((__deprecated__))
#else
# define XINE_DEPRECATED
@@ -89,8 +89,10 @@
/* Format attributes */
#ifdef SUPPORT_ATTRIBUTE_FORMAT
# define XINE_FORMAT_PRINTF(fmt,var) __attribute__((__format__(__printf__, fmt, var)))
+# define XINE_FORMAT_SCANF(fmt,var) __attribute__((__format__(__scanf__, fmt, var)))
#else
# define XINE_FORMAT_PRINTF(fmt,var)
+# define XINE_FORMAT_SCANF(fmt,var)
#endif
#ifdef SUPPORT_ATTRIBUTE_FORMAT_ARG
# define XINE_FORMAT_PRINTF_ARG(fmt) __attribute__((__format_arg__(fmt)))
diff --git a/src/xine-utils/monitor.c b/src/xine-utils/monitor.c
index 301d6c22f..650c10f99 100644
--- a/src/xine-utils/monitor.c
+++ b/src/xine-utils/monitor.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2008 the xine project
*
* This file is part of xine, a free video player.
*
@@ -38,7 +38,6 @@ static long profiler_calls[MAX_ID] ;
static const char *profiler_label[MAX_ID] ;
void xine_profiler_init () {
- int i;
memset(profiler_times, 0, sizeof(profiler_times));
memset(profiler_start, 0, sizeof(profiler_start));
memset(profiler_calls, 0, sizeof(profiler_calls));