[Ltp-cvs] ltp/testcases/kernel/io/disktest sfunc.c,1.4,1.5

[Mike F. <va...@us...>]

Update of /cvsroot/ltp/ltp/testcases/kernel/io/disktest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29862/testcases/kernel/io/disktest

Modified Files:
	sfunc.c 
Log Message:
kill off warning about j being unused

Index: sfunc.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/io/disktest/sfunc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sfunc.c	4 May 2005 17:54:00 -0000	1.4
--- sfunc.c	24 Feb 2006 02:13:40 -0000	1.5
***************
*** 26,29 ****
--- 26,32 ----
  * $Id$
  * $Log$
+ * Revision 1.5  2006/02/24 02:13:40  vapier
+ * kill off warning about j being unused
+ *
  * Revision 1.4  2005/05/04 17:54:00  mridge
  * Update to version 1.2.8
***************
*** 380,384 ****
  	OFF_T *off_tbuf = buf;
  	OFF_T off_tpat = 0, off_tpat2 = 0;
! 	size_t i = 0, j = 0;
  
  #ifdef WINDOWS
--- 383,387 ----
  	OFF_T *off_tbuf = buf;
  	OFF_T off_tpat = 0, off_tpat2 = 0;
! 	size_t i = 0;
  
  #ifdef WINDOWS
***************
*** 387,403 ****
  		off_tpat2 |= (((OFF_T)(ucharpattern[i])) << sizeof(OFF_T)*((sizeof(OFF_T)-1)-i));
  	}
! #endif
! #ifdef AIX
  	off_tpat2 = pass_count;
! #endif
! #ifdef LINUX
! #if __BYTE_ORDER == __LITTLE_ENDIAN
  	ucharpattern = (unsigned char *) &pass_count;
  	for(i=0;i<sizeof(OFF_T);i++) {
  		off_tpat2 |= (((OFF_T)(ucharpattern[i])) << sizeof(OFF_T)*((sizeof(OFF_T)-1)-i));
  	}
! #else
  	off_tpat2 = pass_count;
! #endif
  #endif
  
--- 390,404 ----
  		off_tpat2 |= (((OFF_T)(ucharpattern[i])) << sizeof(OFF_T)*((sizeof(OFF_T)-1)-i));
  	}
! #elif defined AIX
  	off_tpat2 = pass_count;
! #elif defined LINUX
! # if __BYTE_ORDER == __LITTLE_ENDIAN
  	ucharpattern = (unsigned char *) &pass_count;
  	for(i=0;i<sizeof(OFF_T);i++) {
  		off_tpat2 |= (((OFF_T)(ucharpattern[i])) << sizeof(OFF_T)*((sizeof(OFF_T)-1)-i));
  	}
! # else
  	off_tpat2 = pass_count;
! # endif
  #endif
  
***************
*** 413,433 ****
  			for(i=0;i<buf_len;i=i+BLK_SIZE) {
  #ifdef WINDOWS
  				off_tpat = 0;
  				for(j=0;j<sizeof(OFF_T);j++) {
  					off_tpat |= (((OFF_T)(ucharpattern[j])) << sizeof(OFF_T)*((sizeof(OFF_T)-1)-j));
  				}
! #endif
! #ifdef AIX
  				off_tpat = local_lba;
! #endif
! #ifdef LINUX
! #if __BYTE_ORDER == __LITTLE_ENDIAN
  				off_tpat = 0;
  				for(j=0;j<sizeof(OFF_T);j++) {
  					off_tpat |= (((OFF_T)(ucharpattern[j])) << sizeof(OFF_T)*((sizeof(OFF_T)-1)-j));
  				}
! #else
  				off_tpat = local_lba;
! #endif
  #endif
  				/* fill first 8 bytes with lba number */
--- 414,434 ----
  			for(i=0;i<buf_len;i=i+BLK_SIZE) {
  #ifdef WINDOWS
+ 				size_t j;
  				off_tpat = 0;
  				for(j=0;j<sizeof(OFF_T);j++) {
  					off_tpat |= (((OFF_T)(ucharpattern[j])) << sizeof(OFF_T)*((sizeof(OFF_T)-1)-j));
  				}
! #elif defined AIX
  				off_tpat = local_lba;
! #elif defined LINUX
! # if __BYTE_ORDER == __LITTLE_ENDIAN
! 				size_t j;
  				off_tpat = 0;
  				for(j=0;j<sizeof(OFF_T);j++) {
  					off_tpat |= (((OFF_T)(ucharpattern[j])) << sizeof(OFF_T)*((sizeof(OFF_T)-1)-j));
  				}
! # else
  				off_tpat = local_lba;
! # endif
  #endif
  				/* fill first 8 bytes with lba number */