From 4b1578130d411b2e286b3fec9a0fd64d5aef4058 Mon Sep 17 00:00:00 2001
From: Ludovic Jacomme <alliance-cvs@asim.lip6.fr>
Date: Thu, 25 Apr 2002 14:16:44 +0000
Subject: [PATCH] correction petits bugs

---
 alliance/src/mbkedif/src/driver.c   | 19 +++++++++++--------
 alliance/src/mbkedif/src/parser_y.y | 10 +++++-----
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/alliance/src/mbkedif/src/driver.c b/alliance/src/mbkedif/src/driver.c
index 8a3fb14c..d8548e9f 100644
--- a/alliance/src/mbkedif/src/driver.c
+++ b/alliance/src/mbkedif/src/driver.c
@@ -29,6 +29,9 @@
 /*version 1.2 : Extended by Olivier BEAURIN (September, 93)                   */
 /*version 1.2 : Extended by Olivier BEAURIN (November, 93)                    */
 /* $Log: driver.c,v $
+/* Revision 1.3  2002/04/25 14:16:44  ludo
+/* correction petits bugs
+/*
 /* Revision 1.2  2002/03/14 12:36:30  fred
 /* Makes the correct substitutions in lex and yacc generated files.
 /* Fixing includes in dot c files
@@ -465,7 +468,7 @@ char viewtype;
 
 	ptlofig = getlofig(figname, 'P');
 
-	ptlofig->LOCON = (locon_list *)reverse((locon_list *)ptlofig->LOCON);
+	ptlofig->LOCON = (locon_list *)reverse((chain_list *)ptlofig->LOCON);
 
 	edit_con(ptlofig->LOCON);
 
@@ -475,20 +478,20 @@ char viewtype;
 	{
 		fprintf(edif_file, "\n     (contents");
 
-		ptlofig->LOINS = (loins_list *)reverse((loins_list *)ptlofig->LOINS);
+		ptlofig->LOINS = (loins_list *)reverse((chain_list *)ptlofig->LOINS);
 		edit_ins( ptlofig->LOINS );
-		ptlofig->LOINS = (loins_list *)reverse((loins_list *)ptlofig->LOINS);
+		ptlofig->LOINS = (loins_list *)reverse((chain_list *)ptlofig->LOINS);
 
-		ptlofig->LOSIG = (losig_list *)reverse((losig_list *)ptlofig->LOSIG);
+		ptlofig->LOSIG = (losig_list *)reverse((chain_list *)ptlofig->LOSIG);
 		edit_sig( ptlofig );
-		ptlofig->LOSIG = (losig_list *)reverse((losig_list *)ptlofig->LOSIG);
+		ptlofig->LOSIG = (losig_list *)reverse((chain_list *)ptlofig->LOSIG);
 
 		fprintf( edif_file, ")");
 	}
 
 	fprintf(edif_file, "))");
 
-	ptlofig->LOCON = (locon_list *)reverse((locon_list *)ptlofig->LOCON);
+	ptlofig->LOCON = (locon_list *)reverse((chain_list *)ptlofig->LOCON);
 
 	return;
 } /* end of view */
@@ -731,9 +734,9 @@ lofig_list *ptlofig;
 
 			for( sig_ins = ptlofig->LOINS; sig_ins != NULL; sig_ins = sig_ins->NEXT )
             {
-                sig_ins->LOCON = (locon_list *)reverse((locon_list *)sig_ins->LOCON);
+                sig_ins->LOCON = (locon_list *)reverse((chain_list *)sig_ins->LOCON);
 				connect( sig_ins->LOCON, sig_index, sig_ins );
-                sig_ins->LOCON = (locon_list *)reverse((locon_list *)sig_ins->LOCON);
+                sig_ins->LOCON = (locon_list *)reverse((chain_list *)sig_ins->LOCON);
             }
 
 			fprintf(edif_file, "))");
diff --git a/alliance/src/mbkedif/src/parser_y.y b/alliance/src/mbkedif/src/parser_y.y
index 9a2cce9e..66d7bd5b 100644
--- a/alliance/src/mbkedif/src/parser_y.y
+++ b/alliance/src/mbkedif/src/parser_y.y
@@ -1324,7 +1324,7 @@ char *Name;
 	{
 		if ( ( first = strchr( first, '_' ) ) != NULL )
 		{
-            if( strncmp( first, "_60_", 4 ) != NULL )
+            if( strncmp( first, "_60_", 4 ) != 0 )
             {
                 first++;
                 continue;
@@ -1332,7 +1332,7 @@ char *Name;
 			second = first + 4;
 			while( isdigit( *second ) ) second ++;
 
-			if( strcmp( second, "_62" ) != NULL )
+			if( strcmp( second, "_62" ) != 0 )
 			{
 				*first = ' ';
                 first ++;
@@ -1379,7 +1379,7 @@ int  *Max;
 	{
 		if ( (first = strchr (first, '_') ) != NULL )
 		{
-            if( strncmp( first, "_60_", 4 ) != NULL )
+            if( strncmp( first, "_60_", 4 ) != 0 )
             {
                 first++;
                 continue;
@@ -1388,7 +1388,7 @@ int  *Max;
 			array = first + 4;
 			while ( isdigit (*array) ) array ++;
 
-			if ( ( *array != 0 ) && ( strncasecmp (array, "TO", 2) == NULL ) )
+			if ( ( *array != 0 ) && ( strncasecmp (array, "TO", 2) == 0 ) )
 			{
 				middle = array;
 				save = middle [0];
@@ -1396,7 +1396,7 @@ int  *Max;
 				array += 2;
 				while ( isdigit (*array) ) array ++;
 
-				if ( strcmp( first, "_62" ) != NULL )
+				if ( strcmp( first, "_62" ) != 0 )
 				{
 					array [0] = '\0';
 					sscanf (first  + 4, "%d", Min);