[Debian-hebrew-package] r806 - in /pkg/bidiv/trunk: bidiv.c debian/changelog debian/patches/series debian/patches/try_utf8_fix

[tzafrir at users.alioth.debian.org]

Author: tzafrir
Date: Sun Apr 11 00:02:41 2010
New Revision: 806

URL: http://svn.debian.org/wsvn/debian-hebrew/?sc=1&rev=806
Log:
Patch try_utf8_fix: if-def out a variable that is unused if TRY_UTF8
(originally in diff).

Added:
    pkg/bidiv/trunk/debian/patches/try_utf8_fix
Modified:
    pkg/bidiv/trunk/bidiv.c
    pkg/bidiv/trunk/debian/changelog
    pkg/bidiv/trunk/debian/patches/series

Modified: pkg/bidiv/trunk/bidiv.c
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiv/trunk/bidiv.c?rev=806&op=diff
==============================================================================
--- pkg/bidiv/trunk/bidiv.c (original)
+++ pkg/bidiv/trunk/bidiv.c Sun Apr 11 00:02:41 2010
@@ -47,10 +47,7 @@
 void
 bidiv(FILE *fp)
 {
-#ifndef TRY_UTF8
-	char *in;
-#endif
-	char *out;
+	char *in, *out;
 	FriBidiChar *unicode_in, *unicode_out;
 	int len, i, c;
 	int rtl_line;
@@ -65,9 +62,7 @@
 	*/
 	int newline=1, newpara=1;
 
-#ifndef TRY_UTF8
 	in=(char *)malloc(width+1);
-#endif
 	out=(char *)malloc(width*7+1); /* 7 is the maximum number of
 					  bytes in one UTF8 char? */
 	/* We use (width+1) not just width, to leave place for a double-

Modified: pkg/bidiv/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiv/trunk/debian/changelog?rev=806&op=diff
==============================================================================
--- pkg/bidiv/trunk/debian/changelog (original)
+++ pkg/bidiv/trunk/debian/changelog Sun Apr 11 00:02:41 2010
@@ -16,8 +16,10 @@
   * Patch hyphen_minus: hyphen/minus in man page (originally in diff).
   * Patch term_size_get: properly check terminal width (originally in diff).
   * Patch makefile: simple Makefile fixes (originally in diff).
+  * Patch try_utf8_fix: if-def out a variable that is unused if TRY_UTF8
+    (originally in diff).
 
- -- Tzafrir Cohen <tzafrir at debian.org>  Sun, 11 Apr 2010 02:11:55 +0300
+ -- Tzafrir Cohen <tzafrir at debian.org>  Sun, 11 Apr 2010 02:54:10 +0300
 
 bidiv (1.5-3) unstable; urgency=low
 

Modified: pkg/bidiv/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiv/trunk/debian/patches/series?rev=806&op=diff
==============================================================================
--- pkg/bidiv/trunk/debian/patches/series (original)
+++ pkg/bidiv/trunk/debian/patches/series Sun Apr 11 00:02:41 2010
@@ -1,3 +1,4 @@
+try_utf8_fix
 makefile
 fribidi_019
 hyphen_minus

Added: pkg/bidiv/trunk/debian/patches/try_utf8_fix
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiv/trunk/debian/patches/try_utf8_fix?rev=806&op=file
==============================================================================
--- pkg/bidiv/trunk/debian/patches/try_utf8_fix (added)
+++ pkg/bidiv/trunk/debian/patches/try_utf8_fix Sun Apr 11 00:02:41 2010
@@ -1,0 +1,27 @@
+Description: if-def out a variable that is unused if TRY_UTF8.
+Author: Baruch Even <baruch at debian.org>
+
+--- bidiv-1.5.orig/bidiv.c
++++ bidiv-1.5/bidiv.c
+@@ -47,7 +49,10 @@
+ void
+ bidiv(FILE *fp)
+ {
+-	char *in, *out;
++#ifndef TRY_UTF8
++	char *in;
++#endif
++	char *out;
+ 	FriBidiChar *unicode_in, *unicode_out;
+ 	int len, i, c;
+ 	int rtl_line;
+@@ -62,7 +67,9 @@
+ 	*/
+ 	int newline=1, newpara=1;
+ 
++#ifndef TRY_UTF8
+ 	in=(char *)malloc(width+1);
++#endif
+ 	out=(char *)malloc(width*7+1); /* 7 is the maximum number of
+ 					  bytes in one UTF8 char? */
+ 	/* We use (width+1) not just width, to leave place for a double-