Attachment 47209 Details for Bug 72371 – file.diff

[patch] file.diff

file.diff (text/plain), 2.11 KB, created by David Xu on 2004-10-06 04:20:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Xu

Created: 2004-10-06 04:20:22 UTC

Size: 2.11 KB

patch

obsolete

>diff -u ./InputWindow.c.old ./InputWindow.c
>--- ./InputWindow.c.old	Tue Dec 30 15:54:47 2003
>+++ ./InputWindow.c	Wed Oct  6 11:04:54 2004
>@@ -110,7 +110,7 @@
>     char            str1[] = "Ay&#20013;";
>     char            str2[10];
>     char           *ps1, *ps2;
>-    int             l1, l2;
>+    size_t         l1, l2;
> 
>     if (!xftFont)
> 	return;
>@@ -120,7 +120,7 @@
>     ps2 = str2;
>     ps1 = str1;
> 
>-    l1 = iconv (convUTF8, (char **) &ps1, &l1, &ps2, &l2);
>+    l1 = iconv (convUTF8, (const char **) &ps1, &l1, &ps2, &l2);
> 
>     XftTextExtentsUtf8 (dpy, xftFont, str2, strlen (str2), &extents);
>     iInputWindowHeight = extents.height * 2 + extents.height / 2 + 8;
>diff -u ./ui.c.old ./ui.c
>--- ./ui.c.old	Wed Oct  6 11:05:19 2004
>+++ ./ui.c	Wed Oct  6 11:04:54 2004
>@@ -284,7 +284,7 @@
>     XGlyphInfo      extents;
>     char            str1[100];
>     char           *ps, *ps1;
>-    int             l1, l2;
>+    size_t         l1, l2;
> 
>     if (!xftFont)
> 	return 0;
>@@ -294,7 +294,7 @@
>     ps = str1;
>     ps1 = str;
> 
>-    l1 = iconv (convUTF8, (char **) &str, &l1, &ps, &l2);
>+    l1 = iconv (convUTF8, (const char **) &str, &l1, &ps, &l2);
>     *ps = '\0';
>     XftTextExtentsUtf8 (dpy, xftFont, str1, strlen (str1), &extents);
>     return extents.width;
>@@ -323,7 +323,7 @@
> void OutputString (Window window, char *str, int x, int y, XColor color)
> {
>     char            strOutput[100] = "";	//&#35813;&#38271;&#24230;&#24212;&#35813;&#22815;&#29992;&#20102;
>-    int             l1, l2;
>+    size_t          l1, l2;
>     char           *ps;
>     XftColor        xftColor;
>     XRenderColor    renderColor;
>@@ -339,7 +339,7 @@
>     l2 = 99;
>     ps = strOutput;
> 
>-    l1 = iconv (convUTF8, (char **) (&str), &l1, &ps, &l2);
>+    l1 = iconv (convUTF8, (const char **) (&str), &l1, &ps, &l2);
> 
>     renderColor.red = color.red;
>     renderColor.green = color.green;
>diff -u ./xim.c.old ./xim.c
>--- ./xim.c.old	Wed Oct  6 11:05:19 2004
>+++ ./xim.c	Wed Oct  6 11:04:54 2004
>@@ -336,7 +336,7 @@
>     char           *ps;
> 
>     if (bIsUtf8) {
>-	int             l1, l2;
>+	size_t            l1, l2;
> 
> 	ps = strOutput;
> 	l1 = strlen (strHZ);

Actions: View | Diff

Attachments on bug 72371: 47209