← Back to branch summary

~ubuntu-branches/ubuntu/lucid/xorg-server/lucid

« back to all changes in this revision

Viewing changes to debian/patches/116_fix_typos_in_swap_functions.patch

  • Committer: Bazaar Package Importer
  • Author(s): Bryce Harrington
  • Date: 2010-04-14 18:49:56 UTC
  • Revision ID: james.westby@ubuntu.com-20100414184956-fv68fe6gr97o4bq5
Tags: 2:1.7.6-2ubuntu4
* Add several cherrypicks of fixes from upstream git tree which fix various
  issues and that look safe with low or no risk of regression.
  + 115_xext_fix_cursor_ref_counting.patch: Xext: Fix cursor reference
    counting hazard.
  + 116_fix_typos_in_swap_functions.patch: Fixes typos in several of the
    glxcmdsswap routines.
  + 117_fix_crash_with_createglyphset.patch:  Fixes crash introduced in
    FindGlyphsByHash() if one client disconnects while a second is in
    the middle of doing certain Glyph operations.
  + 118_xkb_fix_garbage_init.patch: Fixes typo that can cause garbage
    bits to get appended on the xkbControlsNotify changedControls mask
    because it was uninitialized on the stack.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/116_fix_typos_in_swap_functions.patch
 
1
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 
2
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
3
<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
 
4
<head>
 
5
<title>xorg/xserver - X server</title>
 
6
<meta name='generator' content='cgit v0.8.3.1'/>
 
7
<meta name='robots' content='index, nofollow'/>
 
8
<link rel='stylesheet' type='text/css' href='http://cgit.freedesktop.org/cgit.css'/>
 
9
<link rel='alternate' title='Atom feed' href='http://cgit.freedesktop.org/xorg/xserver/atom/?h=master' type='application/atom+xml'/>
 
10
</head>
 
11
<body>
 
12
<div id='cgit'><table id='header'>
 
13
<tr>
 
14
<td class='logo' rowspan='2'><a href='/'><img src='http://cgit.freedesktop.org/logo.png' alt='cgit logo'/></a></td>
 
15
<td class='main'><a href='/'>index</a> : <a title='xorg/xserver' href='/xorg/xserver/'>xorg/xserver</a></td><td class='form'><form method='get' action=''>
 
16
<input type='hidden' name='id' value='0c2fde5c8ad6e94b4ed1588aa93256a2b64f74d9'/><select name='h' onchange='this.form.submit();'>
 
17
<option value='COMPOSITEWRAP'>COMPOSITEWRAP</option>
 
18
<option value='CYGWIN'>CYGWIN</option>
 
19
<option value='DAMAGE-XFIXES'>DAMAGE-XFIXES</option>
 
20
<option value='Domain-branch'>Domain-branch</option>
 
21
<option value='IPv6-REVIEW'>IPv6-REVIEW</option>
 
22
<option value='STSF-CURRENT'>STSF-CURRENT</option>
 
23
<option value='XACE-SELINUX'>XACE-SELINUX</option>
 
24
<option value='XACE-modular'>XACE-modular</option>
 
25
<option value='XEVIE'>XEVIE</option>
 
26
<option value='XINERAMA_2'>XINERAMA_2</option>
 
27
<option value='XORG-6_8-branch'>XORG-6_8-branch</option>
 
28
<option value='XORG-CURRENT'>XORG-CURRENT</option>
 
29
<option value='XORG-RELEASE-1'>XORG-RELEASE-1</option>
 
30
<option value='XORG-RELEASE-1-STSF'>XORG-RELEASE-1-STSF</option>
 
31
<option value='XORG-RELEASE-1-TM'>XORG-RELEASE-1-TM</option>
 
32
<option value='XORG-STABLE'>XORG-STABLE</option>
 
33
<option value='XPRINT'>XPRINT</option>
 
34
<option value='autoconfig-for-7.2'>autoconfig-for-7.2</option>
 
35
<option value='bcook-backend'>bcook-backend</option>
 
36
<option value='compat_output'>compat_output</option>
 
37
<option value='dmx-2'>dmx-2</option>
 
38
<option value='dri-0-1-branch'>dri-0-1-branch</option>
 
39
<option value='dri2-swapbuffers'>dri2-swapbuffers</option>
 
40
<option value='exa-damagetrack'>exa-damagetrack</option>
 
41
<option value='glucose-2'>glucose-2</option>
 
42
<option value='gsr-current'>gsr-current</option>
 
43
<option value='input-hotplug'>input-hotplug</option>
 
44
<option value='lg3d'>lg3d</option>
 
45
<option value='lg3d-7.2'>lg3d-7.2</option>
 
46
<option value='lg3d-dev'>lg3d-dev</option>
 
47
<option value='lg3d-dev-0-6-1'>lg3d-dev-0-6-1</option>
 
48
<option value='lg3d-dev-0-6-1-1'>lg3d-dev-0-6-1-1</option>
 
49
<option value='lg3d-dev-0-6-1-current'>lg3d-dev-0-6-1-current</option>
 
50
<option value='lg3d-dev-0-6-1-latest'>lg3d-dev-0-6-1-latest</option>
 
51
<option value='lg3d-dev-0-6-2'>lg3d-dev-0-6-2</option>
 
52
<option value='lg3d-dev-0-6-latest'>lg3d-dev-0-6-latest</option>
 
53
<option value='lg3d-dev-0-7-0'>lg3d-dev-0-7-0</option>
 
54
<option value='lg3d-dev-0-7-1'>lg3d-dev-0-7-1</option>
 
55
<option value='lg3d-event'>lg3d-event</option>
 
56
<option value='lg3d-master'>lg3d-master</option>
 
57
<option value='master' selected='selected'>master</option>
 
58
<option value='mpx'>mpx</option>
 
59
<option value='no-pci-rework'>no-pci-rework</option>
 
60
<option value='orib-soc-2006'>orib-soc-2006</option>
 
61
<option value='panning-for-server-1.6'>panning-for-server-1.6</option>
 
62
<option value='pci-rework'>pci-rework</option>
 
63
<option value='randr-1.2'>randr-1.2</option>
 
64
<option value='randr-1.2-for-server-1.2'>randr-1.2-for-server-1.2</option>
 
65
<option value='randr-dpms'>randr-dpms</option>
 
66
<option value='sco_port_update'>sco_port_update</option>
 
67
<option value='server-1.2-branch'>server-1.2-branch</option>
 
68
<option value='server-1.3-branch'>server-1.3-branch</option>
 
69
<option value='server-1.4-branch'>server-1.4-branch</option>
 
70
<option value='server-1.5-branch'>server-1.5-branch</option>
 
71
<option value='server-1.6-branch'>server-1.6-branch</option>
 
72
<option value='server-1.6-enterleave'>server-1.6-enterleave</option>
 
73
<option value='server-1.7-branch'>server-1.7-branch</option>
 
74
<option value='server-1.7-nominations'>server-1.7-nominations</option>
 
75
<option value='server-1.8-branch'>server-1.8-branch</option>
 
76
<option value='server-1_0-branch'>server-1_0-branch</option>
 
77
<option value='server-1_1-branch'>server-1_1-branch</option>
 
78
<option value='transform-proposal'>transform-proposal</option>
 
79
<option value='wonderland-dev'>wonderland-dev</option>
 
80
<option value='xf-4_0_2-branch'>xf-4_0_2-branch</option>
 
81
<option value='xf-4_1-branch'>xf-4_1-branch</option>
 
82
<option value='xf-4_2-branch'>xf-4_2-branch</option>
 
83
<option value='xf-4_3-branch'>xf-4_3-branch</option>
 
84
<option value='xfixes_2_branch'>xfixes_2_branch</option>
 
85
<option value='xgl-0-0-1'>xgl-0-0-1</option>
 
86
<option value='xorg-server-1.2-apple'>xorg-server-1.2-apple</option>
 
87
<option value='xorg-server-1.4-apple'>xorg-server-1.4-apple</option>
 
88
<option value='xorg-server-1.5-apple'>xorg-server-1.5-apple</option>
 
89
<option value='xorg-server-1.6-apple'>xorg-server-1.6-apple</option>
 
90
<option value='xorg-server-1.7-apple'>xorg-server-1.7-apple</option>
 
91
<option value='xquartz-composite'>xquartz-composite</option>
 
92
</select> <input type='submit' name='' value='switch'/></form></td></tr>
 
93
<tr><td class='sub'>X server</td><td class='sub right'>keithp</td></tr></table>
 
94
<table class='tabs'><tr><td>
 
95
<a href='/xorg/xserver/'>summary</a><a href='/xorg/xserver/refs/?id=0c2fde5c8ad6e94b4ed1588aa93256a2b64f74d9'>refs</a><a href='/xorg/xserver/log/'>log</a><a href='/xorg/xserver/tree/?id=0c2fde5c8ad6e94b4ed1588aa93256a2b64f74d9'>tree</a><a class='active' href='/xorg/xserver/commit/?id=0c2fde5c8ad6e94b4ed1588aa93256a2b64f74d9'>commit</a><a href='/xorg/xserver/diff/?id=0c2fde5c8ad6e94b4ed1588aa93256a2b64f74d9'>diff</a></td><td class='form'><form class='right' method='get' action='/xorg/xserver/log/'>
 
96
<input type='hidden' name='id' value='0c2fde5c8ad6e94b4ed1588aa93256a2b64f74d9'/><select name='qt'>
 
97
<option value='grep'>log msg</option>
 
98
<option value='author'>author</option>
 
99
<option value='committer'>committer</option>
 
100
</select>
 
101
<input class='txt' type='text' size='10' name='q' value=''/>
 
102
<input type='submit' value='search'/>
 
103
</form>
 
104
</td></tr></table>
 
105
<div class='content'><table summary='commit info' class='commit-info'>
 
106
<tr><th>author</th><td>Tomas Carnecky &lt;tom@dbservice.com&gt;</td><td class='right'>2010-03-22 18:20:15 (GMT)</td></tr>
 
107
<tr><th>committer</th><td> Keith Packard &lt;keithp@keithp.com&gt;</td><td class='right'>2010-03-23 02:52:14 (GMT)</td></tr>
 
108
<tr><th>commit</th><td colspan='2' class='sha1'><a href='/xorg/xserver/commit/?id=0c2fde5c8ad6e94b4ed1588aa93256a2b64f74d9'>0c2fde5c8ad6e94b4ed1588aa93256a2b64f74d9</a> (<a href='/xorg/xserver/patch/?id=0c2fde5c8ad6e94b4ed1588aa93256a2b64f74d9'>patch</a>)</td></tr>
 
109
<tr><th>tree</th><td colspan='2' class='sha1'><a href='/xorg/xserver/tree/?id=0c2fde5c8ad6e94b4ed1588aa93256a2b64f74d9'>0747b589b1284d04b6b1044db93db8299883c577</a></td></tr>
 
110
<tr><th>parent</th><td colspan='2' class='sha1'><a href='/xorg/xserver/commit/?id=3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e'>3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e</a> (<a href='/xorg/xserver/diff/?id=0c2fde5c8ad6e94b4ed1588aa93256a2b64f74d9&amp;id2=3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='sha1'><a href='/xorg/xserver/snapshot/xserver-0c2fde5c8ad6e94b4ed1588aa93256a2b64f74d9.zip'>xserver-0c2fde5c8ad6e94b4ed1588aa93256a2b64f74d9.zip</a><br/><a href='/xorg/xserver/snapshot/xserver-0c2fde5c8ad6e94b4ed1588aa93256a2b64f74d9.tar.gz'>xserver-0c2fde5c8ad6e94b4ed1588aa93256a2b64f74d9.tar.gz</a><br/><a href='/xorg/xserver/snapshot/xserver-0c2fde5c8ad6e94b4ed1588aa93256a2b64f74d9.tar.bz2'>xserver-0c2fde5c8ad6e94b4ed1588aa93256a2b64f74d9.tar.bz2</a><br/></td></tr></table>
 
111
<div class='commit-subject'>Fix typos in the swap functions</div><div class='commit-msg'>This should fix bug #3539.
 
112
 
 
113
Signed-off-by: Tomas Carnecky &lt;tom@dbservice.com&gt;
 
114
Signed-off-by: Ian Romanick &lt;ian.d.romanick@intel.com&gt;
 
115
Reviewed-by: Keith Packard &lt;keithp@keithp.com&gt;
 
116
Signed-off-by: Keith Packard &lt;keithp@keithp.com&gt;
 
117
</div><div class='diffstat-header'><a href='/xorg/xserver/diff/?id=0c2fde5c8ad6e94b4ed1588aa93256a2b64f74d9'>Diffstat</a></div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/xorg/xserver/diff/glx/glxcmdsswap.c?id=0c2fde5c8ad6e94b4ed1588aa93256a2b64f74d9'>glx/glxcmdsswap.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='8%'><tr><td class='add' style='width: 50.0%;'/><td class='rem' style='width: 50.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
 
118
</table><div class='diffstat-summary'>1 files changed, 4 insertions, 4 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/glx/glxcmdsswap.c b/glx/glxcmdsswap.c<br/>index f1c0ce6..c414dc8 100644<br/>--- a/<a href='/xorg/xserver/tree/glx/glxcmdsswap.c?id=3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e'>glx/glxcmdsswap.c</a><br/>+++ b/<a href='/xorg/xserver/tree/glx/glxcmdsswap.c?id=0c2fde5c8ad6e94b4ed1588aa93256a2b64f74d9'>glx/glxcmdsswap.c</a></div><div class='hunk'>@@ -354,7 +354,7 @@ int __glXDispSwap_CreateGLXPbufferSGIX(__GLXclientState *cl, GLbyte *pc)</div><div class='ctx'> </div><div class='ctx'> int __glXDispSwap_DestroyPbuffer(__GLXclientState *cl, GLbyte *pc)</div><div class='ctx'> {</div><div class='del'>-    xGLXDestroyPbufferReq *req = (xGLXDestroyPbufferReq *) req;</div><div class='add'>+    xGLXDestroyPbufferReq *req = (xGLXDestroyPbufferReq *) pc;</div><div class='ctx'>     __GLX_DECLARE_SWAP_VARIABLES;</div><div class='ctx'> </div><div class='ctx'>     __GLX_SWAP_INT(&amp;req-&gt;pbuffer);</div><div class='hunk'>@@ -364,7 +364,7 @@ int __glXDispSwap_DestroyPbuffer(__GLXclientState *cl, GLbyte *pc)</div><div class='ctx'> </div><div class='ctx'> int __glXDispSwap_DestroyGLXPbufferSGIX(__GLXclientState *cl, GLbyte *pc)</div><div class='ctx'> {</div><div class='del'>-    xGLXDestroyGLXPbufferSGIXReq *req = (xGLXDestroyGLXPbufferSGIXReq *) req;</div><div class='add'>+    xGLXDestroyGLXPbufferSGIXReq *req = (xGLXDestroyGLXPbufferSGIXReq *) pc;</div><div class='ctx'>     __GLX_DECLARE_SWAP_VARIABLES;</div><div class='ctx'> </div><div class='ctx'>     __GLX_SWAP_INT(&amp;req-&gt;pbuffer);</div><div class='hunk'>@@ -375,7 +375,7 @@ int __glXDispSwap_DestroyGLXPbufferSGIX(__GLXclientState *cl, GLbyte *pc)</div><div class='ctx'> int __glXDispSwap_ChangeDrawableAttributes(__GLXclientState *cl, GLbyte *pc)</div><div class='ctx'> {</div><div class='ctx'>     xGLXChangeDrawableAttributesReq *req =</div><div class='del'>-      (xGLXChangeDrawableAttributesReq *) req;</div><div class='add'>+        (xGLXChangeDrawableAttributesReq *) pc;</div><div class='ctx'>     __GLX_DECLARE_SWAP_VARIABLES;</div><div class='ctx'>     __GLX_DECLARE_SWAP_ARRAY_VARIABLES;</div><div class='ctx'>     CARD32 *attribs;</div><div class='hunk'>@@ -392,7 +392,7 @@ int __glXDispSwap_ChangeDrawableAttributesSGIX(__GLXclientState *cl,</div><div class='ctx'>                                             GLbyte *pc)</div><div class='ctx'> {</div><div class='ctx'>     xGLXChangeDrawableAttributesSGIXReq *req =</div><div class='del'>-       (xGLXChangeDrawableAttributesSGIXReq *) req;</div><div class='add'>+    (xGLXChangeDrawableAttributesSGIXReq *) pc;</div><div class='ctx'>     __GLX_DECLARE_SWAP_VARIABLES;</div><div class='ctx'>     __GLX_DECLARE_SWAP_ARRAY_VARIABLES;</div><div class='ctx'>     CARD32 *attribs;</div></td></tr></table></div> <!-- class=content -->
 
119
<div class='footer'>generated  by cgit v0.8.3.1 at 2010-04-15 01:46:50 (GMT)</div>
 
120
</div> <!-- id=cgit -->
 
121
</body>
 
122
</html>