[Rtk-cvs] rtk/test/core string0.cpp,1.12,1.13

[<laz...@us...>]

Update of /cvsroot/rtk/rtk/test/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22997/test/core

Modified Files:
	string0.cpp 
Log Message:
More string fixes
 - Own strtok_r
 - removed strrev (who will need that?) :)

Index: string0.cpp
===================================================================
RCS file: /cvsroot/rtk/rtk/test/core/string0.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** string0.cpp	29 Feb 2004 17:57:10 -0000	1.12
--- string0.cpp	29 Feb 2004 20:53:25 -0000	1.13
***************
*** 40,56 ****
  }
  
! void rstrrev_test()
  {
! 	rprintf(_R("rstrrev_test()\n"));
  
- 	RCHAR source[] = { _R("A sample STRING") };
- 	
- 	OUT("source = '%s'", source);
- 	
- 	STEP( rstrrev(source) );
- 	OUT("source = '%s'", source);
- 	
- 	STEP( rstrrev(source) );
  	OUT("source = '%s'", source);
  }
  
--- 40,61 ----
  }
  
! void rstrtok_r_test()
  {
! 	rprintf(_R("rstrtok_r_test()\n"));
! 
! 	RCHAR *token, *sp;
! 	RCHAR source[] = { _R("LINE TO BE SEPARATED") };
! 	RCHAR *search = _R(" ");
  
  	OUT("source = '%s'", source);
+ 
+ 	/* Token will point to "LINE". */
+ 	STEP(token = rstrtok_r(source, search, &sp));
+ 	OUT("token = '%s'", token);
+ 
+ 	while(token) {
+ 		STEP(token = rstrtok_r(NULL, search, &sp));
+ 		OUT("token = '%s'", token);
+ 	}
  }
  
***************
*** 161,166 ****
  
  	rstrset_test();
- 	rstrrev_test();
  	rstr_case_test();
  
  	return 0;
--- 166,171 ----
  
  	rstrset_test();
  	rstr_case_test();
+ 	rstrtok_r_test();
  
  	return 0;
***************
*** 224,234 ****
  	rstrpbrk(_R(""),0);
  	rstrrchr(_R(""),0);
- 	rstrrev(0);
   	rstrset(0,0);
   	rstrnset(0,0,0);
  	rstrspn(0,0);
  	rstrstr(_R(""), _R(""));
! 	rstrtok(0,0);
! 	rstrtok_r(0,0);
  
  // is*
--- 229,237 ----
  	rstrpbrk(_R(""),0);
  	rstrrchr(_R(""),0);
   	rstrset(0,0);
   	rstrnset(0,0,0);
  	rstrspn(0,0);
  	rstrstr(_R(""), _R(""));
! 	rstrtok_r(0,0,0);	
  
  // is*