Version abc80130_2

1 files changed, 25 insertions, 25 deletions

diff --git a/src/map/super/super.c b/src/map/super/super.c
index ffb432d5..97420c5c 100644
--- a/src/map/super/super.c
+++ b/src/map/super/super.c
@@ -28,7 +28,7 @@ static int Super_CommandSupergates   ( Abc_Frame_t * pAbc, int argc, char **argv
 static int Super_CommandSupergatesAnd( Abc_Frame_t * pAbc, int argc, char **argv );
 
 ////////////////////////////////////////////////////////////////////////
-///                     FUNCTION DEFITIONS                           ///
+///                     FUNCTION DEFINITIONS                         ///
 ////////////////////////////////////////////////////////////////////////
 
 /**Function*************************************************************
@@ -90,20 +90,20 @@ int Super_CommandSupergatesAnd( Abc_Frame_t * pAbc, int argc, char **argv )
     nVarsMax = 4;
     nLevels  = 3;
     fVerbose = 0;
-    util_getopt_reset();
-    while ( (c = util_getopt(argc, argv, "ilvh")) != EOF ) 
+    Extra_UtilGetoptReset();
+    while ( (c = Extra_UtilGetopt(argc, argv, "ilvh")) != EOF ) 
     {
         switch (c) 
         {
             case 'i':
-                nVarsMax = atoi(argv[util_optind]);
-                util_optind++;
+                nVarsMax = atoi(argv[globalUtilOptind]);
+                globalUtilOptind++;
                 if ( nVarsMax < 0 ) 
                     goto usage;
                 break;
             case 'l':
-                nLevels = atoi(argv[util_optind]);
-                util_optind++;
+                nLevels = atoi(argv[globalUtilOptind]);
+                globalUtilOptind++;
                 if ( nLevels < 0 ) 
                     goto usage;
                 break;
@@ -172,44 +172,44 @@ int Super_CommandSupergates( Abc_Frame_t * pAbc, int argc, char **argv )
     fWriteOldFormat = 0;
     ExcludeFile = 0;
 
-    util_getopt_reset();
-    while ( (c = util_getopt(argc, argv, "eiltdasovh")) != EOF ) 
+    Extra_UtilGetoptReset();
+    while ( (c = Extra_UtilGetopt(argc, argv, "eiltdasovh")) != EOF ) 
     {
         switch (c) 
         {
             case 'e':
-                ExcludeFile = argv[util_optind];
+                ExcludeFile = argv[globalUtilOptind];
                 if ( ExcludeFile == 0 )
                     goto usage;
-                util_optind++;
+                globalUtilOptind++;
                 break;
             case 'i':
-                nVarsMax = atoi(argv[util_optind]);
-                util_optind++;
+                nVarsMax = atoi(argv[globalUtilOptind]);
+                globalUtilOptind++;
                 if ( nVarsMax < 0 ) 
                     goto usage;
                 break;
             case 'l':
-                nLevels = atoi(argv[util_optind]);
-                util_optind++;
+                nLevels = atoi(argv[globalUtilOptind]);
+                globalUtilOptind++;
                 if ( nLevels < 0 ) 
                     goto usage;
                 break;
             case 't':
-                TimeLimit = atoi(argv[util_optind]);
-                util_optind++;
+                TimeLimit = atoi(argv[globalUtilOptind]);
+                globalUtilOptind++;
                 if ( TimeLimit < 0 ) 
                     goto usage;
                 break;
             case 'd':
-                DelayLimit = (float)atof(argv[util_optind]);
-                util_optind++;
+                DelayLimit = (float)atof(argv[globalUtilOptind]);
+                globalUtilOptind++;
                 if ( DelayLimit <= 0.0 ) 
                     goto usage;
                 break;
             case 'a':
-                AreaLimit = (float)atof(argv[util_optind]);
-                util_optind++;
+                AreaLimit = (float)atof(argv[globalUtilOptind]);
+                globalUtilOptind++;
                 if ( AreaLimit <= 0.0 ) 
                     goto usage;
                 break;
@@ -231,7 +231,7 @@ int Super_CommandSupergates( Abc_Frame_t * pAbc, int argc, char **argv )
     }
 
 
-    if ( argc != util_optind + 1 )
+    if ( argc != globalUtilOptind + 1 )
     {
         fprintf( pErr, "The GENLIB library file should be given on the command line.\n" );
         goto usage;
@@ -244,9 +244,9 @@ int Super_CommandSupergates( Abc_Frame_t * pAbc, int argc, char **argv )
     }
 
     // get the input file name
-    FileName = argv[util_optind];
-//    if ( (pFile = Io_FileOpen( FileName, "open_path", "r" )) == NULL )
-    if ( (pFile = fopen( FileName, "r" )) == NULL )
+    FileName = argv[globalUtilOptind];
+    if ( (pFile = Io_FileOpen( FileName, "open_path", "r", 0 )) == NULL )
+//    if ( (pFile = fopen( FileName, "r" )) == NULL )
     {
         fprintf( pErr, "Cannot open input file \"%s\". ", FileName );
         if (( FileName = Extra_FileGetSimilarName( FileName, ".genlib", ".lib", ".gen", ".g", NULL ) ))