Fixed a small bug.rel-0-10-2

5 files changed, 11 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index dfac033..db5c051 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2002-03-25  Behdad Esfahbod <behdad@bamdad.org>
+	* fribidi.c: Fixed a bug introduced in adding L3 rule.
+
 2002-03-16  Behdad Esfahbod <behdad@bamdad.org>
 	* Applied the FriBidiEnv patch from Omer Zak dated 2002-02-24,
 	updated it with to reflect the new changes.
diff --git a/TODO b/TODO
index 5204e5e..7194b1f 100644
--- a/TODO
+++ b/TODO
@@ -30,8 +30,6 @@ Implementation issues:
 
 BiDi algorithms issues:
 
-* 
-
 General issues:
 
 * Better documentation.
diff --git a/fribidi.c b/fribidi.c
index caced13..8d3763b 100644
--- a/fribidi.c
+++ b/fribidi.c
@@ -1253,7 +1253,7 @@ fribidi_log2vis ( FriBidiEnv* fribidienv,
 		      {
 			FriBidiCharType this_type;
 
-			this_type = fribidi_get_type (NULL, visual_str[i]);
+			this_type = fribidi_get_type (NULL, str[i]);
 			if (is_nsm_seq && this_type != FRIBIDI_TYPE_NSM)
 			  {
 			    if (visual_str)
diff --git a/fribidi_env.c b/fribidi_env.c
index 20f3733..19c8b38 100644
--- a/fribidi_env.c
+++ b/fribidi_env.c
@@ -228,9 +228,13 @@ void fribidi_set_reorder_nsm (FriBidiEnv* fbenv, boolean reorder)
  *----------------------------------------------------------------------*/
 boolean fribidi_debug_status (FriBidiEnv* fbenv)
 {
+#ifdef DEBUG
   VALIDATE_FRIBIDIENV(fbenv);
 
   return(0 != (fbenv->iFlags & FRIBIDIENV_DEBUG_MODE) ? TRUE : FALSE);
+#else /* DEBUG */
+  return FALSE;
+#endif /* DEBUG */
 }
 
 /*======================================================================
@@ -249,9 +253,9 @@ boolean fribidi_set_debug (FriBidiEnv* fbenv, boolean debug)
   else {
     fbenv->iFlags &= (~FRIBIDIENV_DEBUG_MODE);
   }
-  return(debug);
+  return debug;
 #else /* DEBUG */
-  return(FALSE);
+  return FALSE;
 #endif /* DEBUG */
 }
 
diff --git a/fribidi_env.h b/fribidi_env.h
index 3852af8..9815afb 100644
--- a/fribidi_env.h
+++ b/fribidi_env.h
@@ -255,7 +255,7 @@ extern FriBidiEnv fribidi_global_env;
  *  For environments which need speed/code size optimization.
  *----------------------------------------------------------------------*/
 #ifdef NO_FRIBIDIENV_VALIDATION
-#define VALIDATE_FRIBIDIENV(env)
+#define VALIDATE_FRIBIDIENV(env) while (0) {}
   /* Null definition, for environments, which guarantee valid
   ** environments, and need the efficiency.
   */