[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.16 and 1.17

version 1.16, 2015/08/06 10:01:52 version 1.17, 2015/08/12 10:37:24
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.15 2015/08/04 06:20:45 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/io/io.c,v 1.16 2015/08/06 10:01:52 fujimoto Exp $
 */  */
 #include <stdio.h>  #include <stdio.h>
 #include "ca.h"  #include "ca.h"
Line 278  void write_intarray(FILE *f,unsigned int *p,int l)
Line 278  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 longword (1longword=8bytes) */
   /* low 32of p[0] | 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 ( little_endian && (ox_file_io || ox_need_conv) )          for ( i = 0; i < l; i++, p++) {
                 for ( i = 0; i < l; i++, p++) {                  w = *p; hi = w>>32; lo = w&0xffffffff;
                         w = *p; hi = w>>32; lo = w&0xffffffff;                  hi = htonl(hi); lo = htonl(lo);
                         hi = htonl(hi); lo = htonl(lo);                  gen_fwrite((char *)&lo,sizeof(unsigned int),1,f);
                         gen_fwrite(&hi,sizeof(unsigned int),1,f);                  gen_fwrite((char *)&hi,sizeof(unsigned int),1,f);
                         gen_fwrite(&lo,sizeof(unsigned int),1,f);          }
                 }  
         else  
                 gen_fwrite(p,sizeof(unsigned long),l,f);  
 }  }
 #endif  #endif
   
Line 382  void read_intarray(FILE *f,unsigned int *p,int l)
Line 380  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);            hi = ntohl(hi);
                         hi = ntohl(hi); lo = ntohl(lo);            *p = (((unsigned long)hi)<<32);
                         *p = (((unsigned long)hi)<<32)|((unsigned long)lo);            p++; l--;
                 }          }
                 if ( i == 1 ) {          for ( i = 0; i < l; i += 2, p++ ) {
                         gen_fread(&hi,sizeof(unsigned int),1,f);                  gen_fread((char *)&lo,sizeof(unsigned int),1,f);
                         hi = ntohl(hi); *p = (((unsigned long)hi)<<32);                  gen_fread((char *)&hi,sizeof(unsigned int),1,f);
                 }                  hi = ntohl(hi); lo = ntohl(lo);
         } else                  *p = (((unsigned long)hi)<<32)|((unsigned long)lo);
                 gen_fread(p,sizeof(unsigned int),l,f);          }
 }  }
 #endif  #endif
   
Legend:
Removed from v.1.16  
changed lines
  Added in v.1.17
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>