[BACK]Return to io.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / io

Diff for /OpenXM_contrib2/asir2000/io/io.c between version 1.15 and 1.20

version 1.15, 2015/08/04 06:20:45 version 1.20, 2015/08/17 05:42:20
Line 44 
Line 44 
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY   * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  * $OpenXM: OpenXM_contrib2/asir2000/io/io.c,v 1.14 2009/03/16 16:43:03 ohara Exp $   * $OpenXM: OpenXM_contrib2/asir2000/io/io.c,v 1.19 2015/08/14 13:51:55 fujimoto Exp $
 */  */
 #include <stdio.h>  #include <stdio.h>
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
 #if defined(VISUAL) || defined(MPI)  #if defined(VISUAL) || defined(__MINGW32__) || defined(MPI)
 #include "wsio.h"  #include "wsio.h"
 #endif  #endif
   
Line 102  void ox_copy_init(char *s)
Line 102  void ox_copy_init(char *s)
         ox_copy_bptr = s;          ox_copy_bptr = s;
 }  }
   
 #if !defined(VISUAL)  #if !defined(VISUAL) && !defined(__MINGW32__)
 /*  /*
  * library mode functions   * library mode functions
  * byte order is controlled by lib_ox_need_conv.   * byte order is controlled by lib_ox_need_conv.
Line 137  int gen_fread (char *ptr,int size,int nitems,FILE *str
Line 137  int gen_fread (char *ptr,int size,int nitems,FILE *str
                 /* dummy return */                  /* dummy return */
                 return 0;                  return 0;
         } else {          } else {
 #if defined(VISUAL)  #if defined(VISUAL) || defined(__MINGW32__)
                 if ( _fileno(stream) < 0 )                  if ( _fileno(stream) < 0 )
                         n = cread(ptr,size,nitems,(STREAM *)stream);                          n = cread(ptr,size,nitems,(STREAM *)stream);
                 else                  else
Line 171  int gen_fwrite (char *ptr,int size,int nitems,FILE *st
Line 171  int gen_fwrite (char *ptr,int size,int nitems,FILE *st
                 /* dummy return  */                  /* dummy return  */
                 return 0;                  return 0;
         } else          } else
 #if defined(VISUAL)  #if defined(VISUAL) || defined(__MINGW32__)
         if ( _fileno(stream) < 0 )          if ( _fileno(stream) < 0 )
                 return cwrite(ptr,size,nitems,(STREAM *)stream);                  return cwrite(ptr,size,nitems,(STREAM *)stream);
         else          else
Line 277  void write_intarray(FILE *f,unsigned int *p,int l)
Line 277  void write_intarray(FILE *f,unsigned int *p,int l)
 }  }
   
 #if SIZEOF_LONG == 8  #if SIZEOF_LONG == 8
 /* write l longword (1longword=8bytes) */  /* write l word (1word=4bytes) */
   /* l even : low 32of p[0] | high32 of p[0] | ... */
   /* l odd :  high32 of p[0] | ... */
 void write_longarray(FILE *f,unsigned long *p,int l)  void write_longarray(FILE *f,unsigned long *p,int l)
 {  {
         int i;    int i;
         unsigned long w;    unsigned long w;
         unsigned int hi,lo;    unsigned int hi,lo;
   
     if ( l%2 ) {
       w = p[0]; hi = w>>32;
         if ( little_endian && (ox_file_io || ox_need_conv) )          if ( little_endian && (ox_file_io || ox_need_conv) )
                 for ( i = 0; i < l; i++, p++) {        hi = htonl(hi);
                         w = *p; hi = w>>32; lo = w&0xffffffff;      gen_fwrite((char *)&hi,sizeof(unsigned int),1,f);
                         hi = htonl(hi); lo = htonl(lo);      i = 1;
                         gen_fwrite(&hi,sizeof(unsigned int),1,f);    } else
                         gen_fwrite(&lo,sizeof(unsigned int),1,f);      i = 0;
                 }    l = (l+1)/2;
         else    for ( ; i < l; i++ ) {
                 gen_fwrite(p,sizeof(unsigned long),l,f);      w = p[i]; hi = w>>32; lo = w&0xffffffff;
           if ( little_endian && (ox_file_io || ox_need_conv) ) {
         hi = htonl(hi); lo = htonl(lo);
           }
       gen_fwrite((char *)&lo,sizeof(unsigned int),1,f);
       gen_fwrite((char *)&hi,sizeof(unsigned int),1,f);
     }
 }  }
 #endif  #endif
   
Line 382  void read_intarray(FILE *f,unsigned int *p,int l)
Line 392  void read_intarray(FILE *f,unsigned int *p,int l)
   
 #if SIZEOF_LONG == 8  #if SIZEOF_LONG == 8
 /* read l word (1word=4bytes) */  /* read l word (1word=4bytes) */
   /* pad 0 at low 32 of p[0] if l is odd */
   /* low 32 of p[0] | high32 of p[0] | ... */
 void read_longarray(FILE *f,unsigned long *p,int l)  void read_longarray(FILE *f,unsigned long *p,int l)
 {  {
         int i;          int i;
         unsigned int hi,lo;          unsigned int hi,lo;
       unsigned int *q;
   
         if ( little_endian && (ox_file_io || ox_need_conv) ) {          q = (unsigned int *)p;
                 for ( i = l; i > 1; i -= 2, p++ ) {          if ( l%2 ) {
                         gen_fread(&hi,sizeof(unsigned int),1,f);            gen_fread((char *)&hi,sizeof(unsigned int),1,f);
                         gen_fread(&lo,sizeof(unsigned int),1,f);            if ( little_endian && (ox_file_io || ox_need_conv) )
                         hi = ntohl(hi); lo = ntohl(lo);              hi = ntohl(hi);
                         *p = (((unsigned long)hi)<<32)|((unsigned long)lo);            *p = (((unsigned long)hi)<<32);
             p++; l--;
           }
           for ( i = 0; i < l; i += 2, p++ ) {
                   gen_fread((char *)&lo,sizeof(unsigned int),1,f);
                   gen_fread((char *)&hi,sizeof(unsigned int),1,f);
               if ( little_endian && (ox_file_io || ox_need_conv) ) {
                 hi = ntohl(hi); lo = ntohl(lo);
                 }                  }
                 if ( i == 1 ) {                  *p = (((unsigned long)hi)<<32)|((unsigned long)lo);
                         gen_fread(&hi,sizeof(unsigned int),1,f);          }
                         hi = ntohl(hi); *p = (((unsigned long)hi)<<32);  
                 }  
         } else  
                 gen_fread(p,sizeof(unsigned int),l,f);  
 }  }
 #endif  #endif
   
Legend:
Removed from v.1.15  
changed lines
  Added in v.1.20
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>