firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 07:23:03 +01:00
Code Issues

Synchronize with intl and remove cs_unicode_fss.h

Browse Source
This commit is contained in:
brodsom 2003-03-10 12:55:04 +00:00
parent 23a41a989d
commit ca502c8b22
8 changed files with 8 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/intlcpp/cs_unicode_fss.cpp
View File

@ -26,7 +26,7 @@
#include "firebird.h"
#include "../intlcpp/ldcommon.h"
#include "cv_narrow.h"
#include "cs_unicode_fss.h"
#include "cv_unicode_fss.h"
CHARSET_ENTRY(CS_unicode_fss)
{

31
src/intlcpp/cs_unicode_fss.h
View File

@ -1,31 +0,0 @@
/*
* PROGRAM: InterBase International support
* MODULE: cs_utffss.c
* DESCRIPTION: Character set definition for Unicode FSS format
*
* The contents of this file are subject to the Interbase Public
* License Version 1.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy
* of the License at http://www.Inprise.com/IPL.html
*
* Software distributed under the License is distributed on an
* "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
* or implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code was created by Inprise Corporation
* and its predecessors. Portions created by Inprise Corporation are
* Copyright (C) Inprise Corporation.
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
*/
/* Note: all routines have cousins in jrd/intl.c */
USHORT CS_UTFFSS_unicode_to_fss(CSCONVERT obj, MBCHAR *fss_str, USHORT fss_len, UNICODE *unicode_str,
USHORT unicode_len, SSHORT *err_code, USHORT *err_position);
USHORT CS_UTFFSS_fss_to_unicode(CSCONVERT obj, UNICODE *dest_ptr, USHORT dest_len, NCHAR *src_ptr
, USHORT src_len, SSHORT *err_code, USHORT *err_position);
SSHORT CS_UTFFSS_fss_mbtowc(TEXTTYPE *obj, UCS2_CHAR *wc, NCHAR *p, USHORT n);

9
src/intlcpp/cv_unicode_fss.cpp
View File

@ -25,12 +25,9 @@
#include "firebird.h"
#include "../intlcpp/ldcommon.h"
#include "cs_unicode_fss.h"
typedef USHORT fss_wchar_t;
typedef SLONG fss_size_t;
#include "cv_unicode_fss.h"
static fss_size_t fss_mbtowc( fss_wchar_t * p, NCHAR *s, fss_size_t n);
SSHORT CS_UTFFSS_fss_mbtowc(TEXTTYPE *obj, UCS2_CHAR *wc, NCHAR *p, USHORT n)
{
@ -184,6 +181,8 @@ SSHORT CS_UTFFSS_fss_mbtowc(TEXTTYPE *obj, UCS2_CHAR *wc, NCHAR *p, USHORT n)
*
*/
static fss_size_t fss_mbtowc( fss_wchar_t * p, UCHAR *s, fss_size_t n)
{
long l;

2
src/intlcpp/cv_unicode_fss.h
View File

@ -32,7 +32,7 @@ USHORT CS_UTFFSS_fss_to_unicode(CSCONVERT obj, UNICODE *dest_ptr, USHORT dest_le
USHORT CS_UTFFSS_unicode_to_fss(CSCONVERT obj, MBCHAR *fss_str, USHORT fss_len, UNICODE *unicode_str,
USHORT unicode_len, SSHORT *err_code, USHORT *err_position);
SSHORT CS_UTFFSS_fss_mbtowc(TEXTTYPE obj, UCS2_CHAR *wc, NCHAR *p, USHORT n);
SSHORT CS_UTFFSS_fss_mbtowc(TEXTTYPE *obj, UCS2_CHAR *wc, NCHAR *p, USHORT n);
typedef struct {
int cmask;

1
src/intlcpp/lc_big5.cpp
View File

@ -48,6 +48,7 @@
cache->texttype_name = POSIX;
TEXTTYPE_ENTRY(BIG5_init)
{
static const ASCII POSIX[] = "C.BIG5";

2
src/intlcpp/lc_dos.cpp
View File

@ -635,8 +635,6 @@ STATIC SSHORT fam1_str_to_upper(TEXTTYPE obj, USHORT iLen, BYTE *pStr, USHORT iO
STATIC USHORT fam1_to_lower(TEXTTYPE obj, BYTE ch)
// TEXTTYPE obj;
// BYTE ch;
{
return (LOCALE_LOWER(ch));
}

2
src/intlcpp/lc_jis.cpp
View File

@ -29,8 +29,8 @@
#include "cv_jis.h"
STATIC USHORT sjis_to_upper(TEXTTYPE obj, UCS2_CHAR ch);
STATIC SSHORT sjis_str_to_upper(TEXTTYPE obj, USHORT iLen, BYTE *pStr, USHORT iOutLen, BYTE *pOutStr);
STATIC USHORT sjis_to_lower(TEXTTYPE obj, UCS2_CHAR ch);
STATIC SSHORT sjis_str_to_upper(TEXTTYPE obj, USHORT iLen, BYTE *pStr, USHORT iOutLen, BYTE *pOutStr);
#define FAMILY_MULTIBYTE(id_number, name, charset, country) \
cache->texttype_version = IB_LANGDRV_VERSION; \

1
src/intlcpp/lc_ksc.cpp
View File

@ -28,7 +28,6 @@
#define ASCII_SPACE 32
STATIC USHORT LCKSC_string_to_key(TEXTTYPE obj, USHORT iInLen, BYTE *pInChar
, USHORT iOutLen, BYTE *pOutChar);
STATIC USHORT LCKSC_key_length(TEXTTYPE obj, USHORT inLen);