From e2e45b2b3abf46e4e5c27d7c655769f2b693446e Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Fri, 7 Oct 2016 23:46:05 +0200
Subject: Align files with upstream libX11-1.6.0

This commit looks a bit crazy at first glance. It (re-)introduces lots
of whitespaces and bad formatting.

Explanation: Backporting upstream changes lead to commits being
applied out of order. This meant a lot of manual intervention which in
turn lead to slight differences between upstream and NX.

With this commit these slight differences are minimized which will be
of great help when adding further upstream patches.
---
 nx-X11/lib/X11/udcInf.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'nx-X11/lib/X11/udcInf.c')

diff --git a/nx-X11/lib/X11/udcInf.c b/nx-X11/lib/X11/udcInf.c
index 9acf0fb3f..9ecf1566e 100644
--- a/nx-X11/lib/X11/udcInf.c
+++ b/nx-X11/lib/X11/udcInf.c
@@ -46,7 +46,7 @@ from The Open Group.
 #include <XomGeneric.h>
 
 /*
-   external symbols 
+   external symbols
 */
 extern FontData read_EncodingInfo();
 extern int _xudc_get_codeset();
@@ -145,11 +145,11 @@ int  *num_codeset;
             if(!_XlcCompareISOLatin1(charset_str,buf)){
                 num_ret += 1;
                 if(num_ret == 1){
-                    ret = Xmalloc(sizeof(int));
+		    ret = Xmalloc(sizeof(int));
                 } else {
 		    int *prev_ret = ret;
 
-		    ret = Xrealloc(ret, num_ret * sizeof(int)); 
+		    ret = Xrealloc(ret, num_ret * sizeof(int));
 		    if (ret == NULL){
 			Xfree(prev_ret);
 		    }
@@ -306,9 +306,9 @@ int  *num_gr;
     return 0;
 }
 
-/* 
+/*
  *      Code convert wo tomonau UDC area no kakutoku
- *      GetUDCCPArea() / glyph_to_code()           
+ *      GetUDCCPArea() / glyph_to_code()
  *
  */
 
@@ -372,7 +372,7 @@ XlcCharSet 	charset;
 	sprintf(buf, "csd%d.charset_name", i);
 	_XlcGetLocaleDataBase(lcd, "XLC_CHARSET_DEFINE", buf, &value, &count);
 	if(count > 0){
-	    if(!_XlcNCompareISOLatin1(value[0], 
+	    if(!_XlcNCompareISOLatin1(value[0],
 			charset->name,strlen(value[0])) ){
 		return(True);
 	    }
@@ -403,7 +403,7 @@ int size;
     strcpy(&from[seq_len + name_len],src);
     return True;
 }
-int 
+int
 _xudc_glyph_to_code(locale,charset_str,codeset,glyph_index,codepoint)
 char 	*locale;
 char 	*charset_str;
@@ -429,7 +429,7 @@ unsigned long 	*codepoint;
     dst  = (unsigned char *)to32;
 
     memset(dst,0,25);
-	
+
     lcd = (XLCd)_XlcGenericLoader(locale);
 
     if (!_xudc_gi_to_vgi(lcd,locale,charset_str,codeset,
@@ -557,7 +557,7 @@ int  *num_cr;
 
 /*
  *    code_to_glyph()
- *    
+ *
  */
 typedef struct __XUDCGIInf {
     char 		*charset_str;
@@ -586,7 +586,7 @@ FontScope	scope;
  *
  *
  */
-static Bool  
+static Bool
 _xudc_vgi_to_gi(lcd,locale,vglyph,glyph,charset,charsetname,size)
 XLCd    lcd;
 char    *locale;
@@ -602,7 +602,7 @@ int	size;
     FontData font_data;
     CodeSet cs;
 
-    
+
     for(i=0;;i++){
         sprintf(buf, "fs%d.charset.name",i);
         _XlcGetLocaleDataBase(lcd, "XLC_FONTSET", buf, &value, &count);
-- 
cgit v1.2.3