Package: openr2
Version: 1.3.0-2
Followup-For: Bug #625393
User: [email protected]
Usertags: origin-ubuntu oneiric ubuntu-patch
*** /tmp/tmp9QEj45
In Ubuntu, the attached patch was applied to fix the FTBFS.
This variable can be removed because it's a copy/paste from other functions and
it's not used in this particular function.
Changelog :
* debian/patches:
- remove-unused-variables.patch: Removed unused variables to fix FTBFS
(LP: #831064).
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers oneiric-updates
APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500,
'oneiric')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-10-generic (SMP w/8 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
--- openr2-1.3.0/debian/patches/remove-unused-variables.patch 1970-01-01 01:00:00.000000000 +0100
+++ openr2-1.3.0/debian/patches/remove-unused-variables.patch 2011-09-13 23:40:21.000000000 +0200
@@ -0,0 +1,25 @@
+--- openr2-1.3.0.orig/src/queue.c
++++ openr2-1.3.0/src/queue.c
+@@ -182,7 +182,6 @@ int queue_read(queue_state_t *s, uint8_t
+ int queue_read_byte(queue_state_t *s)
+ {
+ int real_len;
+- int to_end;
+ int iptr;
+ int optr;
+ int byte;
+@@ -190,13 +189,13 @@ int queue_read_byte(queue_state_t *s)
+ /* Snapshot the values (although only iptr should be changeable during this processing) */
+ iptr = s->iptr;
+ optr = s->optr;
++
+ if ((real_len = iptr - optr) < 0)
+ real_len += s->len;
+ /*endif*/
+ if (real_len < 1)
+ return -1;
+ /*endif*/
+- to_end = s->len - optr;
+ byte = s->data[optr];
+ if (++optr >= s->len)
+ optr = 0;
diff -Nru openr2-1.3.0/debian/patches/series openr2-1.3.0/debian/patches/series
--- openr2-1.3.0/debian/patches/series 2010-07-23 20:39:58.000000000 +0200
+++ openr2-1.3.0/debian/patches/series 2011-09-13 23:41:46.000000000 +0200
@@ -1,2 +1,3 @@
avr32
fix_printf
+remove-unused-variables.patch
