database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-12-10 14:22:35 +03:00
Code Activity

Make the printing code somewhat more independent by not relying on

Browse Source 
functions and global variables from the rest of psql.  Also clean up some
data type mismatches created by the last pager patch.
This commit is contained in:
Peter Eisentraut
2003-03-18 22:15:44 +00:00
parent 9384dc6e59
commit cf1cf89649
10 changed files with 88 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/bin/psql/mbprint.c
View File

@@ -3,14 +3,13 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
* $Header: /cvsroot/pgsql/src/bin/psql/mbprint.c,v 1.5 2002/10/03 17:09:42 momjian Exp $
* $Header: /cvsroot/pgsql/src/bin/psql/mbprint.c,v 1.6 2003/03/18 22:15:44 petere Exp $
*/
#include "postgres_fe.h"
#include "mbprint.h"
#include "mb/pg_wchar.h"
#include "settings.h"
/*
* This is an implementation of wcwidth() and wcswidth() as defined in
@@ -310,9 +309,9 @@ mb_utf_validate(unsigned char *pwcs)
*/
int
pg_wcswidth(unsigned char *pwcs, size_t len)
pg_wcswidth(unsigned char *pwcs, size_t len, int encoding)
{
if (pset.encoding == PG_UTF8)
if (encoding == PG_UTF8)
return mb_utf_wcswidth(pwcs, len);
else
{
@@ -325,9 +324,9 @@ pg_wcswidth(unsigned char *pwcs, size_t len)
}
unsigned char *
mbvalidate(unsigned char *pwcs)
mbvalidate(unsigned char *pwcs, int encoding)
{
if (pset.encoding == PG_UTF8)
if (encoding == PG_UTF8)
return mb_utf_validate(pwcs);
else
{