Author: titmuss
Date: Wed Nov 5 14:28:52 2008
New Revision: 3288
URL: http://svn.slimdevices.com?rev=3288&root=Jive&view=rev
Log:
Bug: N/A
Description:
Warn, warn, warn and warn again. And bug fixes needed due to the excessive
warnings.
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/configure
7.3/trunk/squeezeplay/src/squeezeplay/configure.in
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_flac.c
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_mad.c
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_output.c
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_sample.c
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_vorbis.c
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/streambuf.c
7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive.h
7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive_event.c
7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive_font.c
7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive_label.c
7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive_textinput.c
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/configure
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/configure?rev=3288&root=Jive&r1=3287&r2=3288&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/configure (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/configure Wed Nov 5 14:28:52 2008
@@ -21429,7 +21429,7 @@
if test x"$GCC" = x"yes"
then
- CFLAGS="$CFLAGS -Wall -Werror"
+ CFLAGS="$CFLAGS -Wall -Wextra -Werror -Wdeclaration-after-statement
-Wpointer-arith -Wcast-align -Wno-unused-parameter"
fi
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/configure.in
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/configure.in?rev=3288&root=Jive&r1=3287&r2=3288&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/configure.in (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/configure.in Wed Nov 5 14:28:52 2008
@@ -129,7 +129,7 @@
dnl Be pedantic when compiling
if test x"$GCC" = x"yes"
then
- CFLAGS="$CFLAGS -Wall -Werror"
+ CFLAGS="$CFLAGS -Wall -Wextra -Werror -Wdeclaration-after-statement
-Wpointer-arith -Wcast-align -Wno-unused-parameter"
fi
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c?rev=3288&root=Jive&r1=3287&r2=3288&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c Wed
Nov 5 14:28:52 2008
@@ -376,7 +376,7 @@
fifo_lock(&decode_fifo);
- buf = areas[0].addr + (areas[0].first + offset *
areas[0].step) / 8;
+ buf = ((u8_t *)areas[0].addr) + (areas[0].first +
offset * areas[0].step) / 8;
callback(buf, frames);
fifo_unlock(&decode_fifo);
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_flac.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_flac.c?rev=3288&root=Jive&r1=3287&r2=3288&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_flac.c
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_flac.c Wed
Nov 5 14:28:52 2008
@@ -70,7 +70,7 @@
struct decode_flac *self = (struct decode_flac *) data;
const FLAC__int32 *lptr, *rptr;
sample_t *sbuf, *sptr;
- int i;
+ unsigned int i;
if (self->error_occurred) {
return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_mad.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_mad.c?rev=3288&root=Jive&r1=3287&r2=3288&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_mad.c
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_mad.c Wed Nov
5 14:28:52 2008
@@ -45,7 +45,7 @@
MAD_STATE_ERROR,
} state;
- int sample_rate;
+ u32_t sample_rate;
};
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_output.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_output.c?rev=3288&root=Jive&r1=3287&r2=3288&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_output.c
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_output.c Wed
Nov 5 14:28:52 2008
@@ -241,9 +241,8 @@
transition_samples_in_step = 0;
while (decode_fifo.wptr != ptr) {
- size_t bytes_read, samples_read, wrap, bytes_remaining;
+ size_t s, bytes_read, samples_read, wrap, bytes_remaining;
sample_t *sptr;
- int s;
bytes_read = SAMPLES_TO_BYTES(transition_sample_step -
transition_samples_in_step);
wrap = fifo_bytes_until_wptr_wrap(&decode_fifo);
@@ -282,7 +281,7 @@
* a transition - crossfade or fade in. This method applies gain
* to both the new signal and the one that's already in the fifo.
*/
-static void decode_transition_copy_bytes(sample_t *buffer, int nbytes) {
+static void decode_transition_copy_bytes(sample_t *buffer, size_t nbytes) {
sample_t sample, *sptr;
int nsamples, s;
size_t bytes_read;
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_sample.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_sample.c?rev=3288&root=Jive&r1=3287&r2=3288&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_sample.c
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_sample.c Wed
Nov 5 14:28:52 2008
@@ -49,8 +49,7 @@
/* fixme: this crudely mixes the samples onto the buffer */
for (i=0; i<MAX_SAMPLES; i++) {
Sint32 *s, *d;
- size_t len;
- int j;
+ size_t j, len;
if (!sample[i]) {
continue;
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_vorbis.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_vorbis.c?rev=3288&root=Jive&r1=3287&r2=3288&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_vorbis.c
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_vorbis.c Wed
Nov 5 14:28:52 2008
@@ -90,8 +90,8 @@
static bool_t decode_vorbis_callback(void *data) {
struct decode_vorbis *self = (struct decode_vorbis *) data;
vorbis_info *vi;
- size_t nsamples;
- int i, r, buffer_size;
+ size_t i, nsamples;
+ int r, buffer_size;
long bytes;
s16_t *rptr;
sample_t *wptr;
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/streambuf.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/audio/streambuf.c?rev=3288&root=Jive&r1=3287&r2=3288&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/streambuf.c (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/streambuf.c Wed Nov 5
14:28:52 2008
@@ -176,8 +176,7 @@
ssize_t streambuf_feed_fd(int fd) {
- size_t size;
- ssize_t n;
+ ssize_t n, size;
fifo_lock(&streambuf_fifo);
@@ -524,7 +523,7 @@
/* read buffer, but we must not overflow the stream fifo */
n = streambuf_get_freebytes();
- if (n > sizeof(buf)) {
+ if (n > (ssize_t)sizeof(buf)) {
n = sizeof(buf);
}
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive.h
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive.h?rev=3288&root=Jive&r1=3287&r2=3288&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive.h (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive.h Wed Nov 5 14:28:52 2008
@@ -258,7 +258,7 @@
Uint32 layout;
Uint32 draw;
Uint32 event;
- Uint32 queue;
+ int queue;
Uint32 garbage;
};
@@ -352,7 +352,7 @@
JiveFont *jive_font_ref(JiveFont *font);
void jive_font_free(JiveFont *font);
int jive_font_width(JiveFont *font, const char *str);
-int jive_font_nwidth(JiveFont *font, const char *str, int len);
+int jive_font_nwidth(JiveFont *font, const char *str, size_t len);
int jive_font_height(JiveFont *font);
int jive_font_capheight(JiveFont *font);
int jive_font_ascend(JiveFont *font);
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive_event.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive_event.c?rev=3288&root=Jive&r1=3287&r2=3288&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive_event.c (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive_event.c Wed Nov 5
14:28:52 2008
@@ -80,7 +80,7 @@
luaL_error(L, "invalid Event");
}
- lua_pushinteger(L, event->type);
+ lua_pushinteger(L, (lua_Integer)event->type);
return 1;
}
@@ -92,7 +92,7 @@
luaL_error(L, "invalid Event");
}
- lua_pushinteger(L, event->ticks);
+ lua_pushinteger(L, (lua_Integer)event->ticks);
return 1;
}
@@ -127,7 +127,7 @@
case JIVE_EVENT_KEY_UP:
case JIVE_EVENT_KEY_PRESS:
case JIVE_EVENT_KEY_HOLD:
- lua_pushinteger(L, event->u.key.code);
+ lua_pushinteger(L, (lua_Integer)event->u.key.code);
return 1;
default:
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive_font.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive_font.c?rev=3288&root=Jive&r1=3287&r2=3288&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive_font.c (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive_font.c Wed Nov 5
14:28:52 2008
@@ -107,7 +107,7 @@
return font->width(font, str);
}
-int jive_font_nwidth(JiveFont *font, const char *str, int len) {
+int jive_font_nwidth(JiveFont *font, const char *str, size_t len) {
int w;
char *tmp;
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive_label.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive_label.c?rev=3288&root=Jive&r1=3287&r2=3288&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive_label.c (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive_label.c Wed Nov 5
14:28:52 2008
@@ -66,8 +66,7 @@
int jiveL_label_skin(lua_State *L) {
LabelWidget *peer;
JiveTile *bg_tile;
- size_t num_format;
- int i;
+ size_t i, num_format;
/* stack is:
* 1: widget
@@ -122,7 +121,7 @@
Uint16 width, height, offset;
int max_width = 0;
int total_height = 0;
- int num_lines = 0;
+ size_t num_lines = 0;
const char *str, *ptr;
peer = jive_getpeer(L, 1, &labelPeerMeta);
@@ -221,7 +220,7 @@
int jiveL_label_layout(lua_State *L) {
LabelWidget *peer;
Uint16 y;
- int i;
+ size_t i;
/* stack is:
* 1: widget
@@ -327,7 +326,7 @@
int jiveL_label_draw(lua_State *L) {
- int i;
+ size_t i;
/* stack is:
* 1: widget
@@ -431,7 +430,7 @@
static void jive_label_gc_lines(LabelWidget *peer) {
- int i;
+ size_t i;
if (!peer->num_lines) {
return;
@@ -460,7 +459,7 @@
static void jive_label_gc_formats(LabelWidget *peer) {
- int i;
+ size_t i;
jive_label_gc_format(&peer->base);
for (i=0; i<peer->num_format; i++) {
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive_textinput.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive_textinput.c?rev=3288&root=Jive&r1=3287&r2=3288&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive_textinput.c (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive_textinput.c Wed Nov 5
14:28:52 2008
@@ -124,8 +124,7 @@
bool drawLayer = luaL_optinteger(L, 3, JIVE_LAYER_ALL) & peer->w.layer;
const char *text;
- size_t text_len;
- int cursor;
+ size_t cursor, text_len;
int indent;
SDL_Rect old_clip, new_clip;
Uint16 text_h, text_x, text_y, text_cy, text_w, cursor_x, cursor_w,
cursor_h;
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
