[maemo-commits] [maemo-commits] r12157 - in projects/haf/trunk/libosso: debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-06-07 11:30:42 +0300 (Thu, 07 Jun 2007)
New Revision: 12157

Modified:
   projects/haf/trunk/libosso/debian/changelog
   projects/haf/trunk/libosso/src/osso-state.c
Log:
fix some -pedantic warnings


Modified: projects/haf/trunk/libosso/debian/changelog
===================================================================
--- projects/haf/trunk/libosso/debian/changelog	2007-06-07 08:29:40 UTC (rev 12156)
+++ projects/haf/trunk/libosso/debian/changelog	2007-06-07 08:30:42 UTC (rev 12157)
@@ -1,3 +1,10 @@
+libosso (2.13-1) unstable; urgency=low
+
+  * UNRELEASED
+  * Fix some warnings in osso-state.c when using -pedantic
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu,  7 Jun 2007 11:30:03 +0300
+
 libosso (2.12-1) unstable; urgency=low
 
   * Partially applied a patch from Debian guys. Fixes: MB#1517

Modified: projects/haf/trunk/libosso/src/osso-state.c
===================================================================
--- projects/haf/trunk/libosso/src/osso-state.c	2007-06-07 08:29:40 UTC (rev 12156)
+++ projects/haf/trunk/libosso/src/osso-state.c	2007-06-07 08:30:42 UTC (rev 12157)
@@ -213,7 +213,7 @@
 	    goto _get_state_ret1;
 	}
 	total_bytes += bytes_read;
-	p += bytes_read;
+	p = (char*)p + bytes_read;
     }while(total_bytes < state->state_size);
 
     if(total_bytes < state->state_size) {
@@ -339,7 +339,7 @@
 	    ret = OSSO_ERROR;
 	    break;
 	}
-	pt += bytes;
+	pt = (char*)pt + bytes;
 	total_bytes += bytes;
     }while(total_bytes < state->state_size);