Skip to content

Commit c6b2838

Browse files
tatsuo-ishiitatsuo-ishii
committed
Fix typo. Remove #ifdef MULTIBYTE
1 parent 06ad580 commit c6b2838

File tree

1 file changed

+25
-35
lines changed

1 file changed

+25
-35
lines changed

‎src/include/mb/pg_wchar.h

Lines changed: 25 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: pg_wchar.h,v 1.40 2002/07/18 02:02:30 ishii Exp $ */
1+
/* $Id: pg_wchar.h,v 1.41 2002/07/29 08:04:55 ishii Exp $ */
22

33
#ifndef PG_WCHAR_H
44
#define PG_WCHAR_H
@@ -15,13 +15,8 @@
1515
/*
1616
* The pg_wchar
1717
*/
18-
#ifdef MULTIBYTE
1918
typedef unsigned int pg_wchar;
2019

21-
#else
22-
#define pg_wchar char
23-
#endif
24-
2520
/*
2621
* various definitions for EUC
2722
*/
@@ -197,9 +192,6 @@ typedef enum pg_enc
197192
#define PG_ENCODING_BE_LAST PG_ISO_8859_8
198193
#define PG_ENCODING_FE_LAST PG_WIN1256
199194

200-
201-
#ifdef MULTIBYTE
202-
203195
/*
204196
* Please use these tests before access to pg_encconv_tbl[]
205197
* or to other places...
@@ -284,29 +276,29 @@ typedef struct
284276
unsigned int utf; /* UTF-8 */
285277
} pg_local_to_utf;
286278

287-
extern int pg_mb2wchar(const unsigned char *, pg_wchar *);
288-
extern int pg_mb2wchar_with_len(const unsigned char *, pg_wchar *, int);
289-
extern int pg_char_and_wchar_strcmp(const char *, const pg_wchar *);
290-
extern int pg_wchar_strncmp(const pg_wchar *, const pg_wchar *, size_t);
291-
extern int pg_char_and_wchar_strncmp(const char *, const pg_wchar *, size_t);
292-
extern size_t pg_wchar_strlen(const pg_wchar *);
293-
extern int pg_mblen(const unsigned char *);
294-
extern int pg_encoding_mblen(int, const unsigned char *);
295-
extern int pg_mule_mblen(const unsigned char *);
296-
extern int pg_mic_mblen(const unsigned char *);
297-
extern int pg_mbstrlen(const unsigned char *);
298-
extern int pg_mbstrlen_with_len(const unsigned char *, int);
299-
extern int pg_mbcliplen(const unsigned char *, int, int);
300-
extern int pg_mbcharcliplen(const unsigned char *, int, int);
301-
extern int pg_encoding_max_length(int);
279+
extern int pg_mb2wchar(const unsigned char *from, pg_wchar *to);
280+
extern int pg_mb2wchar_with_len(const unsigned char *from, pg_wchar *to, int len);
281+
extern int pg_char_and_wchar_strcmp(const char *s1, const pg_wchar *s2);
282+
extern int pg_wchar_strncmp(const pg_wchar *s1, const pg_wchar *s2, size_t n);
283+
extern int pg_char_and_wchar_strncmp(const char *s1, const pg_wchar *s2, size_t n);
284+
extern size_t pg_wchar_strlen(const pg_wchar *wstr);
285+
extern int pg_mblen(const unsigned char *mbstr);
286+
extern int pg_encoding_mblen(int encoding, const unsigned char *mbstr);
287+
extern int pg_mule_mblen(const unsigned char *mbstr);
288+
extern int pg_mic_mblen(const unsigned char *mbstr);
289+
extern int pg_mbstrlen(const unsigned char *mbstr);
290+
extern int pg_mbstrlen_with_len(const unsigned char *mbstr, int len);
291+
extern int pg_mbcliplen(const unsigned char *mbstr, int len, int limit);
292+
extern int pg_mbcharcliplen(const unsigned char *mbstr, int len, int imit);
293+
extern int pg_encoding_max_length(int encoding);
302294
extern int pg_database_encoding_max_length(void);
303295

304296
extern void SetDefaultClientEncoding(void);
305297
extern int SetClientEncoding(int encoding, bool doit);
306298
extern int pg_get_client_encoding(void);
307299
extern const char *pg_get_client_encoding_name(void);
308300

309-
extern void SetDatabaseEncoding(int);
301+
extern void SetDatabaseEncoding(int encoding);
310302
extern int GetDatabaseEncoding(void);
311303
extern const char *GetDatabaseEncodingName(void);
312304

@@ -318,24 +310,22 @@ extern unsigned char *pg_do_encoding_conversion(unsigned char *src, int len,
318310
int src_encoding,
319311
int dest_encoding);
320312

321-
extern unsigned char *pg_client_to_server(unsigned char *, int);
322-
extern unsigned char *pg_server_to_client(unsigned char *, int);
313+
extern unsigned char *pg_client_to_server(unsigned char *s, int len);
314+
extern unsigned char *pg_server_to_client(unsigned char *s, int len);
323315

324-
extern unsigned short BIG5toCNS(unsigned short, unsigned char *);
325-
extern unsigned short CNStoBIG5(unsigned short, unsigned char);
316+
extern unsigned short BIG5toCNS(unsigned short big5, unsigned char *lc);
317+
extern unsigned short CNStoBIG5(unsigned short cns, unsigned char lc);
326318

327319
extern void LocalToUtf(unsigned char *iso, unsigned char *utf,
328320
pg_local_to_utf *map, int size, int encoding, int len);
329321

330322
extern void UtfToLocal(unsigned char *utf, unsigned char *iso,
331323
pg_utf_to_local *map, int size, int len);
332324

333-
char *pg_verifymbstr(const unsigned char *, int);
334-
335-
void pg_ascii2mic(unsigned char *src, unsigned char *dest, int len);
336-
void pg_mic2ascii(unsigned char *src, unsigned char *dest, int len);
337-
void pg_print_bogus_char(unsigned char **mic, unsigned char **p);
325+
extern char *pg_verifymbstr(const unsigned char *mbstr, int len);
338326

339-
#endif /* MULTIBYTE */
327+
extern void pg_ascii2mic(unsigned char *src, unsigned char *dest, int len);
328+
extern void pg_mic2ascii(unsigned char *src, unsigned char *dest, int len);
329+
extern void pg_print_bogus_char(unsigned char **mic, unsigned char **p);
340330

341331
#endif /* PG_WCHAR_H */

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy