=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/biovar.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- OpenXM_contrib2/asir2000/io/biovar.c 2016/03/31 05:30:32 1.5 +++ OpenXM_contrib2/asir2000/io/biovar.c 2018/03/29 01:32:53 1.6 @@ -44,7 +44,7 @@ * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. - * $OpenXM: OpenXM_contrib2/asir2000/io/biovar.c,v 1.4 2001/10/09 01:36:20 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/biovar.c,v 1.5 2016/03/31 05:30:32 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -57,121 +57,121 @@ void savevl(s,vl) FILE *s; VL vl; { - int n,i; - VL tvl; + int n,i; + VL tvl; - for ( tvl = vl, n = 0; tvl; tvl = NEXT(tvl)) - if ( tvl->v->attr != (pointer)V_UC && tvl->v->attr != (pointer)V_PF ) - n++; - write_int(s,&n); - vtab = (V *)CALLOC(n,sizeof(V)); - for ( tvl = vl, i = 0; i < n; tvl = NEXT(tvl) ) - if ( tvl->v->attr != (pointer)V_UC && tvl->v->attr != (pointer)V_PF ) { - vtab[i] = tvl->v; savev(s,vtab[i]); i++; - } + for ( tvl = vl, n = 0; tvl; tvl = NEXT(tvl)) + if ( tvl->v->attr != (pointer)V_UC && tvl->v->attr != (pointer)V_PF ) + n++; + write_int(s,&n); + vtab = (V *)CALLOC(n,sizeof(V)); + for ( tvl = vl, i = 0; i < n; tvl = NEXT(tvl) ) + if ( tvl->v->attr != (pointer)V_UC && tvl->v->attr != (pointer)V_PF ) { + vtab[i] = tvl->v; savev(s,vtab[i]); i++; + } } void loadvl(s) FILE *s; { - int n,i,need_reorder; - V v1,v2; - VL t,t1; + int n,i,need_reorder; + V v1,v2; + VL t,t1; - read_int(s,&n); - vtab = (V *)CALLOC(n,sizeof(V)); - for ( i = 0; i < n; i++ ) - loadv(s,&vtab[i]); - need_reorder = 0; - for ( i = 0; i < n-1; i++ ) { - v1 = vtab[i]; v2 = vtab[i+1]; - for ( t = CO; t->v != v1 && t->v != v2; t = NEXT(t) ); - if ( t->v == v2 ) { - need_reorder = 1; break; - } - } - if ( need_reorder ) { - for ( i = n-1, t = 0; i >= 0; i-- ) { - NEWVL(t1); t1->v = vtab[i]; NEXT(t1) = t; t = t1; - } - file_vl = t; - } else - file_vl = 0; + read_int(s,&n); + vtab = (V *)CALLOC(n,sizeof(V)); + for ( i = 0; i < n; i++ ) + loadv(s,&vtab[i]); + need_reorder = 0; + for ( i = 0; i < n-1; i++ ) { + v1 = vtab[i]; v2 = vtab[i+1]; + for ( t = CO; t->v != v1 && t->v != v2; t = NEXT(t) ); + if ( t->v == v2 ) { + need_reorder = 1; break; + } + } + if ( need_reorder ) { + for ( i = n-1, t = 0; i >= 0; i-- ) { + NEWVL(t1); t1->v = vtab[i]; NEXT(t1) = t; t = t1; + } + file_vl = t; + } else + file_vl = 0; } void skipvl(s) FILE *s; { - int n,i,size,len; + int n,i,size,len; - read_int(s,&n); - for ( i = 0, size = 0; i < n; i++ ) { - read_int(s,&len); size += len; - } - fseek(s,size,1L); + read_int(s,&n); + for ( i = 0, size = 0; i < n; i++ ) { + read_int(s,&len); size += len; + } + fseek(s,size,1L); } void savev(s,v) FILE *s; V v; { - savestr(s,NAME(v)); + savestr(s,NAME(v)); } void loadv(s,vp) FILE *s; V *vp; { - P p; - char *name; + P p; + char *name; - loadstr(s,&name); - if ( name ) { + loadstr(s,&name); + if ( name ) { FUNC f; gen_searchf_searchonly(name,&f,1); if ( f ) - makesrvar(f,&p); + makesrvar(f,&p); else - makevar(name,&p); - *vp = VR(p); - } else - *vp = 0; + makevar(name,&p); + *vp = VR(p); + } else + *vp = 0; } int save_convv(v) V v; { - int i; + int i; - if ( ox_do_count ) - return 0; - if ( v->attr == (pointer)V_PF ) - return -1; - for ( i = 0; vtab[i]; i++ ) - if ( vtab[i] == v ) - return i; - error("save_convv : cannot happen"); - /* NOTREACHED */ - return -1; + if ( ox_do_count ) + return 0; + if ( v->attr == (pointer)V_PF ) + return -1; + for ( i = 0; vtab[i]; i++ ) + if ( vtab[i] == v ) + return i; + error("save_convv : cannot happen"); + /* NOTREACHED */ + return -1; } V load_convv(vindex) int vindex; { - return vtab[vindex]; + return vtab[vindex]; } void swap_bytes(ptr,unit,size) char *ptr; int unit,size; { - char *p; - int i,j,hunit; - char t; - - for ( i = 0, p = ptr, hunit = unit/2; i < size; i++, p += unit ) - for ( j = 0; j < hunit; j++ ) { - t = p[j]; p[j] = p[unit-j-1]; p[unit-j-1] = t; - } + char *p; + int i,j,hunit; + char t; + + for ( i = 0, p = ptr, hunit = unit/2; i < size; i++, p += unit ) + for ( j = 0; j < hunit; j++ ) { + t = p[j]; p[j] = p[unit-j-1]; p[unit-j-1] = t; + } }