Bug#632632: libaal: diff for NMU version 1.0.5-5.1

[Luk Claes]

tags 632632 + pending
thanks

Dear maintainer,

I've prepared an NMU for libaal (versioned as 1.0.5-5.1) and
will have it uploaded soon.

Cheers

Luk

diff -u libaal-1.0.5/debian/changelog libaal-1.0.5/debian/changelog
--- libaal-1.0.5/debian/changelog
+++ libaal-1.0.5/debian/changelog
@@ -1,3 +1,10 @@
+libaal (1.0.5-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Use bit_t instead of int (Closes: #632632).
+
+ -- Luk Claes <l...@debian.org>  Tue, 03 Jul 2012 00:31:28 +0000
+
 libaal (1.0.5-5) unstable; urgency=low
 
   * Remove libaal.la and libaal-minimal.la.
only in patch2:
unchanged:
--- libaal-1.0.5.orig/src/bitops.c
+++ libaal-1.0.5/src/bitops.c
@@ -80,7 +80,7 @@
 				    bit_t size,
 				    bit_t offset) 
 {
-	int bit = offset & 7, res;
+	bit_t bit = offset & 7, res;
 	unsigned char *addr = map;
 	unsigned char *p = addr + (offset >> 3);
   
@@ -100,7 +100,7 @@
 
 /* Finds zero bit in @byte starting from @offset */
 static inline int aal_find_nzb(unsigned char byte, bit_t offset) {
-        int i = offset;
+        bit_t i = offset;
         unsigned char mask = 1 << offset;
 
         while ((byte & mask) != 0) {
@@ -119,9 +119,9 @@
 				   bit_t offset)
 {
         unsigned char *addr = map;
-        unsigned int byte_nr = offset >> 3;
-        unsigned int bit_nr = offset & 0x7;
-        unsigned int max_byte_nr = (size - 1) >> 3;
+        bit_t byte_nr = offset >> 3;
+        bit_t bit_nr = offset & 0x7;
+        bit_t max_byte_nr = (size - 1) >> 3;
 
         if (bit_nr != 0) {
 		unsigned int b = ~(unsigned int)addr[byte_nr];
@@ -152,8 +152,8 @@
 			   bit_t start, 
 			   bit_t count)
 {
-	int end_byte;
-	int start_byte;
+	bit_t end_byte;
+	bit_t start_byte;
 	char *addr = map;
 	bit_t left, right;
 	
@@ -185,8 +185,8 @@
 			 bit_t start, 
 			 bit_t count)
 {
-	int end_byte;
-	int start_byte;
+	bit_t end_byte;
+	bit_t start_byte;
 	char *addr = map;
 	bit_t left, right;