[BACK]Return to imach.c CVS log [TXT] [DIR] Up to [Local Repository] / imach / src

Diff for /imach/src/imach.c between versions 1.146 and 1.149

version 1.146, 2014/06/16 10:20:28 version 1.149, 2014/06/18 15:51:14
Line 1 Line 1
 /* $Id$  /* $Id$
   $State$    $State$
   $Log$    $Log$
     Revision 1.149  2014/06/18 15:51:14  brouard
     Summary: Some fixes in parameter files errors
     Author: Nicolas Brouard
   
     Revision 1.148  2014/06/17 17:38:48  brouard
     Summary: Nothing new
     Author: Brouard
   
     Just a new packaging for OS/X version 0.98nS
   
     Revision 1.147  2014/06/16 10:33:11  brouard
     *** empty log message ***
   
   Revision 1.146  2014/06/16 10:20:28  brouard    Revision 1.146  2014/06/16 10:20:28  brouard
   Summary: Merge    Summary: Merge
   Author: Brouard    Author: Brouard
Line 483  extern int errno; Line 496  extern int errno;
 #define ODIRSEPARATOR '/'  #define ODIRSEPARATOR '/'
 #endif  #endif
   
 <<<<<<< imach.c  
 /* $Id$ */  
 =======  
 /* $Id$ */  /* $Id$ */
 >>>>>>> 1.145  
 /* $State$ */  /* $State$ */
   
 <<<<<<< imach.c  char version[]="Imach version 0.98nT, January 2014,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)";
 char version[]="Imach version 0.98nR2, January 2014,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)";  
 char fullversion[]="$Revision$ $Date$";   char fullversion[]="$Revision$ $Date$"; 
 =======  
 char version[]="Imach version 0.98nR2, January 2014,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)";  
 char fullversion[]="$Revision$ $Date$";   
 >>>>>>> 1.145  
 char strstart[80];  char strstart[80];
 char optionfilext[10], optionfilefiname[FILENAMELENGTH];  char optionfilext[10], optionfilefiname[FILENAMELENGTH];
 int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings  */  int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings  */
Line 5385  int main(int argc, char *argv[]) Line 5389  int main(int argc, char *argv[])
   /*---------arguments file --------*/    /*---------arguments file --------*/
   
   if((ficpar=fopen(optionfile,"r"))==NULL)    {    if((ficpar=fopen(optionfile,"r"))==NULL)    {
     printf("Problem with optionfile %s\n",optionfile);      printf("Problem with optionfile %s with errno=%s\n",optionfile,strerror(errno));
     fprintf(ficlog,"Problem with optionfile %s\n",optionfile);      fprintf(ficlog,"Problem with optionfile %s with errno=%s\n",optionfile,strerror(errno));
     fflush(ficlog);      fflush(ficlog);
     goto end;      /* goto end; */
       exit(70); 
   }    }
   
   
Removed from v.1.146  
changed lines
  Added in v.1.149

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>