changeset 2518:4c9910af4cc5 trunk

[svn] - fix signed vs unsigned comparisons and missing initializer warnings
author nenolod
date Wed, 14 Feb 2007 11:05:36 -0800
parents 5fea66ad690c
children 793ede082399
files ChangeLog src/audacious/build_stamp.c src/audacious/vfs_buffer.c
diffstat 3 files changed, 17 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Feb 14 10:48:52 2007 -0800
+++ b/ChangeLog	Wed Feb 14 11:05:36 2007 -0800
@@ -1,3 +1,11 @@
+2007-02-14 18:48:52 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [4044]
+  - fix a signed vs unsigned comparison
+  
+  trunk/src/libaudacious/beepctrl.c |    4 ++--
+  1 file changed, 2 insertions(+), 2 deletions(-)
+
+
 2007-02-14 14:42:50 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [4042]
   - avoid double free while playing cdda.
--- a/src/audacious/build_stamp.c	Wed Feb 14 10:48:52 2007 -0800
+++ b/src/audacious/build_stamp.c	Wed Feb 14 11:05:36 2007 -0800
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070214-4042";
+const gchar *svn_stamp = "20070214-4044";
--- a/src/audacious/vfs_buffer.c	Wed Feb 14 10:48:52 2007 -0800
+++ b/src/audacious/vfs_buffer.c	Wed Feb 14 11:05:36 2007 -0800
@@ -55,7 +55,9 @@
 
     handle = (VFSBuffer *) file->handle;
 
-    for (i = ptr; i - ptr < nmemb * size && i - ptr <= handle->size; i++, handle->iter++)
+    for (i = ptr; (gsize) (i - ptr) < nmemb * size && 
+	 (gsize) (i - ptr) <= handle->size;
+	 i++, handle->iter++)
     {
        *i = *handle->iter;
        read++;
@@ -80,7 +82,9 @@
 
     handle = (VFSBuffer *) file->handle;
 
-    for (i = ptr; (i - ptr) < nmemb * size && (i - ptr) <= handle->size; i++, handle->iter++)
+    for (i = ptr; (gsize) (i - ptr) < nmemb * size &&
+	 (gsize) (i - ptr) <= handle->size;
+	 i++, handle->iter++)
     {
        *handle->iter = *i;
        written++;
@@ -193,7 +197,8 @@
 	buffer_vfs_rewind_impl,
 	buffer_vfs_ftell_impl,
 	buffer_vfs_feof_impl,
-	buffer_vfs_truncate_impl
+	buffer_vfs_truncate_impl,
+	NULL
 };
 
 VFSFile *