@@ -99,8 +99,7 @@ pg_euc2wchar_with_len(const unsigned char *from, pg_wchar *to, int len)
9999* to |=* from ++ ;
100100len -= 2 ;
101101}
102- else
103- /* must be ASCII */
102+ else /* must be ASCII */
104103{
105104* to = * from ++ ;
106105len -- ;
@@ -340,7 +339,7 @@ pg_euctw_dsplen(const unsigned char *s)
340339}
341340
342341/*
343- * Convert pg_wchar to EUC_* encoding.
342+ * Convert pg_wchar to EUC_* encoding.
344343 * caller must allocate enough space for "to", including a trailing zero!
345344 * len: length of from.
346345 * "from" not necessarily null terminated.
@@ -353,23 +352,23 @@ pg_wchar2euc_with_len(const pg_wchar *from, unsigned char *to, int len)
353352while (len > 0 && * from )
354353{
355354unsignedchar c ;
356-
357- if ((c = * from >>24 ))
355+
356+ if ((c = ( * from >>24 ) ))
358357{
359358* to ++ = c ;
360359* to ++ = (* from >>16 )& 0xff ;
361360* to ++ = (* from >>8 )& 0xff ;
362361* to ++ = * from & 0xff ;
363362cnt += 4 ;
364363}
365- else if ((c = * from >>16 ))
364+ else if ((c = ( * from >>16 ) ))
366365{
367366* to ++ = c ;
368367* to ++ = (* from >>8 )& 0xff ;
369368* to ++ = * from & 0xff ;
370369cnt += 3 ;
371370}
372- else if ((c = * from >>8 ))
371+ else if ((c = ( * from >>8 ) ))
373372{
374373* to ++ = c ;
375374* to ++ = * from & 0xff ;
@@ -379,7 +378,7 @@ pg_wchar2euc_with_len(const pg_wchar *from, unsigned char *to, int len)
379378{
380379* to ++ = * from ;
381380cnt ++ ;
382- }
381+ }
383382from ++ ;
384383len -- ;
385384}
@@ -516,7 +515,7 @@ pg_wchar2utf_with_len(const pg_wchar *from, unsigned char *to, int len)
516515while (len > 0 && * from )
517516{
518517int char_len ;
519-
518+
520519unicode_to_utf8 (* from ,to );
521520char_len = pg_utf_mblen (to );
522521cnt += char_len ;
@@ -803,10 +802,11 @@ static int
803802pg_wchar2mule_with_len (const pg_wchar * from ,unsignedchar * to ,int len )
804803{
805804int cnt = 0 ;
806- unsignedchar lb ;
807805
808806while (len > 0 && * from )
809807{
808+ unsignedchar lb ;
809+
810810lb = (* from >>16 )& 0xff ;
811811if (IS_LC1 (lb ))
812812{
@@ -853,7 +853,7 @@ pg_wchar2mule_with_len(const pg_wchar *from, unsigned char *to, int len)
853853}
854854else
855855{
856- * to ++ = lb ;
856+ * to ++ = * from & 0xff ;
857857cnt += 1 ;
858858}
859859from ++ ;