File: revert-fix-1617.patch

package info (click to toggle)
motif 2.3.8-4
  • links: PTS, VCS
  • area: main
  • in suites: trixie
  • size: 36,432 kB
  • sloc: ansic: 452,643; sh: 4,611; makefile: 2,030; yacc: 1,604; lex: 352; cpp: 348
file content (148 lines) | stat: -rw-r--r-- 4,379 bytes parent folder | download | duplicates (2)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
Description: Partially revert fix for upstream bug #1617
 This patch reverts changes which caused TabStack demo
 to segfault when starting.
 https://sourceforge.net/p/motif/code/ci/2b90f83a51ac73b1238e7f9b64949667ddbdd8fe/
Bug: http://bugs.motifzone.net/show_bug.cgi?id=1661
Author: Graham Inggs <ginggs@debian.org>
Last-Update: 2024-09-01

--- a/demos/programs/ColorSel/util-c.c
+++ b/demos/programs/ColorSel/util-c.c
@@ -1412,17 +1412,17 @@
 	switch(toVal.size)
 	{
 	case 1:
-	    val = (XTPOINTER)(unsigned)(*(char*)toVal.addr);    /* may be exists bug */
+	    val = (XTPOINTER)(*(char*)toVal.addr);
 	    break;
 	case 2:
-	    val = (XTPOINTER)(unsigned)(*(short*)toVal.addr);    /* may be exists bug */
+	    val = (XTPOINTER)(*(short*)toVal.addr);
 	    break;
 	case 4:
-	    val = (XTPOINTER)(unsigned)(*(int*)toVal.addr);      /* may be exists bug */
+	    val = (XTPOINTER)(*(int*)toVal.addr);
 	    break;
 	case 8:
 	default:
-	    val = (XTPOINTER)(unsigned)(*(long*)toVal.addr);     /* may be exists bug */
+	    val = (XTPOINTER)(*(long*)toVal.addr);
 	    break;
 	}
     }
--- a/demos/programs/Ext18List/util-c.c
+++ b/demos/programs/Ext18List/util-c.c
@@ -1412,17 +1412,17 @@
 	switch(toVal.size)
 	{
 	case 1:
-	    val = (XTPOINTER)(unsigned)(*(char*)toVal.addr);
+	    val = (XTPOINTER)(*(char*)toVal.addr);
 	    break;
 	case 2:
-	    val = (XTPOINTER)(unsigned)(*(short*)toVal.addr);
+	    val = (XTPOINTER)(*(short*)toVal.addr);
 	    break;
 	case 4:
-	    val = (XTPOINTER)(unsigned)(*(int*)toVal.addr);
+	    val = (XTPOINTER)(*(int*)toVal.addr);
 	    break;
 	case 8:
 	default:
-	    val = (XTPOINTER)(unsigned)(*(long*)toVal.addr);
+	    val = (XTPOINTER)(*(long*)toVal.addr);
 	    break;
 	}
     }
--- a/demos/programs/IconB/misc.c
+++ b/demos/programs/IconB/misc.c
@@ -1384,17 +1384,17 @@
 	switch(toVal.size)
 	{
 	case 1:
-	    val = (XTPOINTER)(unsigned)(*(char*)toVal.addr);
+	    val = (XTPOINTER)(*(char*)toVal.addr);
 	    break;
 	case 2:
-	    val = (XTPOINTER)(unsigned)(*(short*)toVal.addr);
+	    val = (XTPOINTER)(*(short*)toVal.addr);
 	    break;
 	case 4:
-	    val = (XTPOINTER)(unsigned)(*(int*)toVal.addr);
+	    val = (XTPOINTER)(*(int*)toVal.addr);
 	    break;
 	case 8:
 	default:
-	    val = (XTPOINTER)(unsigned)(*(long*)toVal.addr);
+	    val = (XTPOINTER)(*(long*)toVal.addr);
 	    break;
 	}
     }
--- a/demos/programs/Paned/paned.c
+++ b/demos/programs/Paned/paned.c
@@ -180,7 +180,7 @@
 {
     Arg args[5];
     Cardinal argcnt;
-    Boolean val = (Boolean) (unsigned)client;
+    Boolean val = (Boolean) client;
 
     if (!XmToggleButtonGetState(w))
 	return;
@@ -201,7 +201,7 @@
 {
     Arg args[5];
     Cardinal argcnt;
-    unsigned char orient = (unsigned char) (unsigned)client;
+    unsigned char orient = (unsigned char) client;
     
     if (!XmToggleButtonGetState(w))
 	return;
--- a/demos/programs/TabStack/bxutils.c
+++ b/demos/programs/TabStack/bxutils.c
@@ -1435,17 +1435,17 @@
 	switch(toVal.size)
 	{
 	case 1:
-	    val = (XTPOINTER)(unsigned)(*(char*)toVal.addr);    /* may be here exists bug ! */
+	    val = (XTPOINTER)(*(char*)toVal.addr);
 	    break;
 	case 2:
-	    val = (XTPOINTER)(unsigned)(*(short*)toVal.addr);   /* may be here exists bug ! */
+	    val = (XTPOINTER)(*(short*)toVal.addr);
 	    break;
 	case 4:
-	    val = (XTPOINTER)(unsigned)(*(int*)toVal.addr);     /* may be here exists bug ! */
+	    val = (XTPOINTER)(*(int*)toVal.addr);
 	    break;
 	case 8:
 	default:
-	    val = (XTPOINTER)(unsigned)(*(long*)toVal.addr);    /* may be here exists bug ! */
+	    val = (XTPOINTER)(*(long*)toVal.addr);
 	    break;
 	}
     }
--- a/demos/programs/Tree/bxutil-c.c
+++ b/demos/programs/Tree/bxutil-c.c
@@ -1412,17 +1412,17 @@
 	switch(toVal.size)
 	{
 	case 1:
-	    val = (XTPOINTER)(unsigned)(*(char*)toVal.addr);    /* may be here bug */
+	    val = (XTPOINTER)(*(char*)toVal.addr);
 	    break;
 	case 2:
-	    val = (XTPOINTER)(unsigned)(*(short*)toVal.addr);   /* may be here bug */
+	    val = (XTPOINTER)(*(short*)toVal.addr);
 	    break;
 	case 4:
-	    val = (XTPOINTER)(unsigned)(*(int*)toVal.addr);     /* may be here bug */
+	    val = (XTPOINTER)(*(int*)toVal.addr);
 	    break;
 	case 8:
 	default:
-	    val = (XTPOINTER)(unsigned)(*(long*)toVal.addr);    /* may be here bug */
+	    val = (XTPOINTER)(*(long*)toVal.addr);
 	    break;
 	}
     }