[FriBidi-commit] fribidi2/lib fribidi-bidi.c, 1.17, 1.18 fribidi-types.h, 1.9, 1.10 fribidi.c, 1.15, 1.16

[Behdad Esfahbod]

Update of /cvs/fribidi/fribidi2/lib
In directory gabe:/tmp/cvs-serv8824/lib

Modified Files:
	fribidi-bidi.c fribidi-types.h fribidi.c 
Log Message:
Small changes to shut gcc warnings up.


Index: fribidi-bidi.c
===================================================================
RCS file: /cvs/fribidi/fribidi2/lib/fribidi-bidi.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- fribidi-bidi.c	21 Jun 2004 18:49:23 -0000	1.17
+++ fribidi-bidi.c	30 Jul 2005 09:06:28 -0000	1.18
@@ -899,8 +899,8 @@
     }
 
   if UNLIKELY
-    (off + len > FRIBIDI_MAX_STRING_LENGTH && (positions_V_to_L ||
-					       positions_L_to_V))
+    ((unsigned long) off + (unsigned long) len >
+     FRIBIDI_MAX_STRING_LENGTH && (positions_V_to_L || positions_L_to_V))
     {
 #     if DEBUG
       MSG2 (FRIBIDI ": cannot handle strings > %lu characters\n",

Index: fribidi-types.h
===================================================================
RCS file: /cvs/fribidi/fribidi2/lib/fribidi-types.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- fribidi-types.h	3 Jul 2004 11:36:15 -0000	1.9
+++ fribidi-types.h	30 Jul 2005 09:06:28 -0000	1.10
@@ -132,8 +132,8 @@
 
 #ifndef FRIBIDI_MAX_STRING_LENGTH
 # define FRIBIDI_MAX_STRING_LENGTH (sizeof (FriBidiStrIndex) == 2 ?	\
-		0xFFFF : (sizeof (FriBidiStrIndex) == 1 ? \
-		0xFF : 0xFFFFFFFFL))
+		0x7FFF : (sizeof (FriBidiStrIndex) == 1 ? \
+		0x7F : 0x7FFFFFFFL))
 #endif
 
 /* A few macros for working with bits */

Index: fribidi.c
===================================================================
RCS file: /cvs/fribidi/fribidi2/lib/fribidi.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- fribidi.c	21 Jun 2004 21:15:31 -0000	1.15
+++ fribidi.c	30 Jul 2005 09:06:28 -0000	1.16
@@ -91,7 +91,7 @@
       if UNLIKELY
 	(!position_from_this_list) goto out;
       private_from_this = true;
-      for (i = len - 1; i >= 0; i--)
+      for (i = 0; i < len; i++)
 	position_from_this_list[positions_to_this[i]] = i;
     }