[Rtk-cvs] rtk/rtk rchar.h,1.11,1.12 rchar_ascii.h,1.6,1.7 rchar_unicode.h,1.5,1.6

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

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

Modified Files:
	rchar.h rchar_ascii.h rchar_unicode.h 
Log Message:
More string fixes
 - Own strtok_r
 - removed strrev (who will need that?) :)

Index: rchar.h
===================================================================
RCS file: /cvsroot/rtk/rtk/rtk/rchar.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** rchar.h	29 Feb 2004 17:57:09 -0000	1.11
--- rchar.h	29 Feb 2004 20:53:25 -0000	1.12
***************
*** 3,6 ****
--- 3,7 ----
  
  #include "conf.h"
+ #include "Export.h"
  
  #include <stdio.h>
***************
*** 29,33 ****
   * @return The address of the original string, 'str'.
   */
! RCHAR* rstrlwr(RCHAR* str);
  
  /** Convert a string to uppercase.
--- 30,34 ----
   * @return The address of the original string, 'str'.
   */
! RTK_API RCHAR* rstrlwr(RCHAR* str);
  
  /** Convert a string to uppercase.
***************
*** 36,40 ****
   * @return The address of the original string, 'str'.
   */
! RCHAR* rstrupr(RCHAR* str);
  
  } // namespace Rtk
--- 37,51 ----
   * @return The address of the original string, 'str'.
   */
! RTK_API RCHAR* rstrupr(RCHAR* str);
! 
! 
! /** Breaks the string 'str' into a sequence of tokens, 
!  * each of which is delimited by a character from the string pointed to by 'delim'. 
!  * @param str		NULL, or the string that you want to break into tokens. 
!  * @param delim		A set of the characters that separate the tokens. 
!  * @param save_ptr	The address of a pointer to a character, which the function can use to store information necessary for it to continue scanning the same string. 
!  * @return A pointer to the token found, or NULL if no token was found.
!  */
! RTK_API RCHAR *rstrtok_r (RCHAR *str, const RCHAR *delim, RCHAR **save_ptr);
  
  } // namespace Rtk

Index: rchar_ascii.h
===================================================================
RCS file: /cvsroot/rtk/rtk/rtk/rchar_ascii.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** rchar_ascii.h	29 Feb 2004 17:57:10 -0000	1.6
--- rchar_ascii.h	29 Feb 2004 20:53:25 -0000	1.7
***************
*** 76,84 ****
  #define		rstrpbrk		strpbrk
  #define		rstrrchr		strrchr
- #define		rstrrev			strrev
  #define		rstrspn			strspn
  #define		rstrstr			strstr
- #define		rstrtok			strtok
- #define		rstrtok_r		strtok_r
  #define		rstrset(s,v)	((RCHAR*)memset((s),(v),rstrlen(s)))
  #define		rstrnset(s,v,n) ((RCHAR*)memset((s),(v),(n)))
--- 76,81 ----

Index: rchar_unicode.h
===================================================================
RCS file: /cvsroot/rtk/rtk/rtk/rchar_unicode.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** rchar_unicode.h	29 Feb 2004 17:57:10 -0000	1.5
--- rchar_unicode.h	29 Feb 2004 20:53:25 -0000	1.6
***************
*** 18,23 ****
  #	define snwprintf		_snwprintf							
  #	define getws			_getws
- #	define putws			_putws
- #	define wcsrev			_wcsrev
  #	define wcsset			_wcsset
  #	define wcsnset			_wcsnset
--- 18,21 ----
***************
*** 46,50 ****
  #define		rfputs			fputws
  #define		rputtchar		putwchar
! #define		rputs			putws
  
  // str <-> number conversions
--- 44,48 ----
  #define		rfputs			fputws
  #define		rputtchar		putwchar
! #define		rputs(x)		fputws((x), stdout)
  
  // str <-> number conversions
***************
*** 58,63 ****
  #if !defined(_RTK_WIN32_) && defined(UNICODE)
  
- #include "Export.h"
- 
  // printf like
  RTK_API int rvsnprintf(RCHAR* dst, int max_len, const RCHAR* fmt, va_list args);
--- 56,59 ----
***************
*** 119,127 ****
  #define		rstrpbrk		wcspbrk
  #define		rstrrchr		wcsrchr
- #define		rstrrev			wcsrev
  #define		rstrspn			wcsspn
  #define		rstrstr			wcsstr
- #define		rstrtok			wcstok
- #define		rstrtok_r		wcstok
  #define		rstrset(s,v)	((RCHAR*)wmemset((s),(v),rstrlen(s)))
  #define		rstrnset(s,v,n) ((RCHAR*)wmemset((s),(v),(n)))
--- 115,120 ----