Bug#593476: eblook: incompatible pointer type, 'ssize_t *' vs 'int *'

[Tatsuya Kinoshita]

Package: eblook
Version: 1:1.6.1-8
Severity: important
Tags: upstream patch

The amd64 buildd log seems that argument 4 of 'eb_read_rawtext' and
argument 7 of 'eb_read_text' are problematic on 64bit environments,
suggested by Kazuhiro Ito.

<https://buildd.debian.org/fetch.cgi?pkg=eblook;ver=1%3A1.6.1-8;arch=amd64;stamp=1281842571>
| eblook.c: In function 'command_pbm':
| eblook.c:1187: warning: passing argument 4 of 'eb_read_rawtext' from 
incompatible pointer type
| /usr/include/eb/text.h:144: note: expected 'ssize_t *' but argument is of 
type 'int *'
| eblook.c: In function 'command_xbm':
| eblook.c:1262: warning: passing argument 4 of 'eb_read_rawtext' from 
incompatible pointer type
| /usr/include/eb/text.h:144: note: expected 'ssize_t *' but argument is of 
type 'int *'
| eblook.c: In function 'process_child':
| eblook.c:3109: warning: passing argument 7 of 'eb_read_text' from 
incompatible pointer type
| /usr/include/eb/text.h:138: note: expected 'ssize_t *' but argument is of 
type 'int *'
| eblook.c: In function 'show_candidate':
| eblook.c:3186: warning: passing argument 7 of 'eb_read_text' from 
incompatible pointer type
| /usr/include/eb/text.h:138: note: expected 'ssize_t *' but argument is of 
type 'int *'

The attached patch fixes this bug.

Thanks,
--
Tatsuya Kinoshita

Description: Fix incompatible pointer type for eb_read_* functions
Author: Kazuhiro Ito <k...@d1.dion.ne.jp>, Tatsuya Kinoshita <t...@debian.org>

diff -urN eblook-1.6.1.orig/eblook.c eblook-1.6.1/eblook.c
--- eblook-1.6.1.orig/eblook.c	2004-06-18 01:09:01.000000000 +0900
+++ eblook-1.6.1/eblook.c	2010-08-18 00:02:36.000000000 +0900
@@ -1166,7 +1166,7 @@
 {
     static unsigned char buffer[MAX_BITMAP_SIZE];
     EB_Position pos;
-    int len;
+    ssize_t len;
     int ret;
     int i;
     int j;
@@ -1241,7 +1241,7 @@
 {
     static unsigned char buffer[MAX_BITMAP_SIZE];
     EB_Position pos;
-    int len;
+    ssize_t len;
     int ret;
     int i;
     int j;
@@ -3097,7 +3097,7 @@
 {
     EB_Error_Code error_code;
     char buf[2048];
-    int buflen;
+    ssize_t buflen;
 
 #if MULTI_DEBUG
     xprintf(">> seeking %d:%d\n", can->child_pos.page, can->child_pos.offset);
@@ -3109,7 +3109,7 @@
     error_code = eb_read_text(book, 0, &multi_candidate_hookset, NULL, 2047, buf, &buflen);
 #if MULTI_DEBUG
     xprintf(">> eb_read_text %s\n", eb_error_message(error_code));
-    xprintf(">> buflen = %d\n", buflen);
+    xprintf(">> buflen = %ld\n", (long)buflen);
     xprintf(">> ]\n");
 #endif
 
@@ -3168,7 +3168,7 @@
     EB_Position pos0;
 {
     char buf[2048];
-    int buflen;
+    ssize_t buflen;
     struct multi_can *child, *ptail;
     EB_Error_Code error_code = EB_SUCCESS;
 
@@ -3191,7 +3191,7 @@
 	return 0;
     }
 #if MULTI_DEBUG
-    xprintf(">> buflen = %d\n", buflen);
+    xprintf(">> buflen = %ld\n", (long)buflen);
 #endif
 
     tail->terminated = 1;

pgpwhreFcUdqk.pgp
Description: PGP signature