got rid of unneccessary yyrestart()

diff --git a/lib/calib_yacc.y b/lib/calib_yacc.y
index b7f7657969efb57cf16e23828f2f72d13803f440..687b68bb758a63a20468e57e746aa09f0ed73ad7 100644 (file)
--- a/lib/calib_yacc.y
+++ b/lib/calib_yacc.y
@@ -31,6 +31,7 @@
 struct calibration_file_contents file_contents;
 static struct caldac_setting caldac;
 static int cal_index;
+FILE *calib_yyin;
 
 static void free_calibration_setting( struct calibration_setting *setting )
 {
@@ -179,7 +180,7 @@ extern void cleanup_calibration_parse( void )
 
 extern const struct calibration_file_contents* parse_calibration_file( FILE *file )
 {
-       calib_yyrestart( file );
+       calib_yyin = file;
        init_calib_parse();
        if( calib_yyparse() ) return NULL;
        return &file_contents;

diff --git a/lib/libinternal.h b/lib/libinternal.h
index 9c1bcb006d52738c667ffe0b0591e9173e5f6229..ea212caed384c60b143410e01b022651a68cd9dc 100644 (file)
--- a/lib/libinternal.h
+++ b/lib/libinternal.h
@@ -186,7 +186,6 @@ struct calibration_file_contents
 int calib_yylex( void );
 void calib_yyerror( char *s );
 int calib_yyparse( void );
-void calib_yyrestart( FILE *calibration_file );
 const struct calibration_file_contents* parse_calibration_file( FILE *file );
 void cleanup_calibration_parse( void );