mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove #ifdef MULTIBYTE

Browse Source
This commit is contained in:
Tatsuo Ishii 2002-08-08 06:32:26 +00:00
parent b084cc3504
commit b53c851655
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/libpq/pqformat.c
View File

@ -16,7 +16,7 @@
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: pqformat.c,v 1.21 2002/06/20 20:29:28 momjian Exp $ * $Id: pqformat.c,v 1.22 2002/08/08 06:32:26 ishii Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -52,9 +52,7 @@
#include "libpq/libpq.h" #include "libpq/libpq.h"
#include "libpq/pqformat.h" #include "libpq/pqformat.h"
#ifdef MULTIBYTE
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
#endif
#ifdef HAVE_ENDIAN_H #ifdef HAVE_ENDIAN_H
#include <endian.h> #include <endian.h>
#endif #endif
@ -127,7 +125,6 @@ pq_sendbytes(StringInfo buf, const char *data, int datalen)
void void
pq_sendcountedtext(StringInfo buf, const char *str, int slen) pq_sendcountedtext(StringInfo buf, const char *str, int slen)
{ {
#ifdef MULTIBYTE
char *p; char *p;
p = (char *) pg_server_to_client((unsigned char *) str, slen); p = (char *) pg_server_to_client((unsigned char *) str, slen);
@ -139,7 +136,6 @@ pq_sendcountedtext(StringInfo buf, const char *str, int slen)
pfree(p); pfree(p);
return; return;
} }
#endif
pq_sendint(buf, slen + 4, 4); pq_sendint(buf, slen + 4, 4);
appendBinaryStringInfo(buf, str, slen); appendBinaryStringInfo(buf, str, slen);
} }
@ -156,7 +152,6 @@ pq_sendstring(StringInfo buf, const char *str)
{ {
int slen = strlen(str); int slen = strlen(str);
#ifdef MULTIBYTE
char *p; char *p;
p = (char *) pg_server_to_client((unsigned char *) str, slen); p = (char *) pg_server_to_client((unsigned char *) str, slen);
@ -167,7 +162,6 @@ pq_sendstring(StringInfo buf, const char *str)
pfree(p); pfree(p);
return; return;
} }
#endif
appendBinaryStringInfo(buf, str, slen + 1); appendBinaryStringInfo(buf, str, slen + 1);
} }
@ -232,8 +226,6 @@ int
pq_puttextmessage(char msgtype, const char *str) pq_puttextmessage(char msgtype, const char *str)
{ {
int slen = strlen(str); int slen = strlen(str);
#ifdef MULTIBYTE
char *p; char *p;
p = (char *) pg_server_to_client((unsigned char *) str, slen); p = (char *) pg_server_to_client((unsigned char *) str, slen);
@ -244,7 +236,6 @@ pq_puttextmessage(char msgtype, const char *str)
pfree(p); pfree(p);
return result; return result;
} }
#endif
return pq_putmessage(msgtype, str, slen + 1); return pq_putmessage(msgtype, str, slen + 1);
} }
@ -305,14 +296,10 @@ int
pq_getstr(StringInfo s) pq_getstr(StringInfo s)
{ {
int result; int result;
#ifdef MULTIBYTE
char *p; char *p;
#endif
result = pq_getstring(s); result = pq_getstring(s);
#ifdef MULTIBYTE
p = (char *) pg_client_to_server((unsigned char *) s->data, s->len); p = (char *) pg_client_to_server((unsigned char *) s->data, s->len);
if (p != s->data) /* actual conversion has been done? */ if (p != s->data) /* actual conversion has been done? */
{ {
@ -322,7 +309,6 @@ pq_getstr(StringInfo s)
appendBinaryStringInfo(s, p, strlen(p)); appendBinaryStringInfo(s, p, strlen(p));
pfree(p); pfree(p);
} }
#endif
return result; return result;
} }