Attachment 2667 Details for Bug 3273 – constify-server-core-1.patch

[patch] constify-server-core-1.patch

constify-server-core-1.patch (text/plain), 15.72 KB, created by Adam Jackson on 2005-05-11 21:59:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Jackson

Created: 2005-05-11 21:59:06 UTC

Size: 15.72 KB

patch

obsolete

> lib/Xdmcp/Wraphelp.c                                      |    6 +++---
> lib/font/util/utilbitmap.c                                |    2 +-
> lib/lbxutil/image/lbxbwcodes.h                            |    4 ++--
> lib/lbxutil/image/lbxfax.h                                |    4 ++--
> lib/lbxutil/image/misc.c                                  |    6 +++---
> lib/xkbfile/cout.c                                        |    2 +-
> programs/Xserver/hw/dmx/input/lnx-keyboard.c              |    4 ++--
> programs/Xserver/hw/xfree86/common/xf86.h                 |    2 +-
> programs/Xserver/hw/xfree86/common/xf86Debug.c            |    3 ++-
> programs/Xserver/hw/xfree86/common/xf86DefModes.c         |    2 +-
> programs/Xserver/hw/xfree86/common/xf86KbdLnx.c           |    4 ++--
> programs/Xserver/hw/xfree86/common/xf86Keymap.h           |    2 +-
> programs/Xserver/hw/xfree86/common/xf86Priv.h             |    2 +-
> programs/Xserver/hw/xfree86/loader/dixsym.c               |    2 +-
> programs/Xserver/hw/xfree86/loader/fontsym.c              |    2 +-
> programs/Xserver/hw/xfree86/loader/misym.c                |    2 +-
> programs/Xserver/hw/xfree86/loader/xf86sym.c              |    2 +-
> programs/Xserver/hw/xfree86/os-support/linux/lnx_KbdMap.c |    4 ++--
> programs/Xserver/xkb/xkbDflts.h                           |    2 +-
> 19 files changed, 29 insertions(+), 28 deletions(-)
>
>Index: lib/Xdmcp/Wraphelp.c
>===================================================================
>RCS file: /cvs/xorg/xc/lib/Xdmcp/Wraphelp.c,v
>retrieving revision 1.4
>diff -u -d -r1.4 Wraphelp.c
>--- lib/Xdmcp/Wraphelp.c	24 Aug 2004 18:33:32 -0000	1.4
>+++ lib/Xdmcp/Wraphelp.c	12 May 2005 04:46:50 -0000
>@@ -63,7 +63,7 @@
>  * insure compliance.
>  */
> 
>-static CARD32 skb[8][64] = {
>+static const CARD32 skb[8][64] = {
> 	/* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
> 	{ 0x00000000,0x00000010,0x20000000,0x20000010,
> 	  0x00010000,0x00010010,0x20010000,0x20010010,
>@@ -203,7 +203,7 @@
> };
> 
> 
>-static CARD32 SPtrans[8][64] = {
>+static const CARD32 SPtrans[8][64] = {
> 	/* nibble 0 */
> 	{ 0x00410100, 0x00010000, 0x40400000, 0x40410100,
> 	  0x00400000, 0x40010100, 0x40010000, 0x40400000,
>@@ -369,7 +369,7 @@
> #define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\
> 	(a)=(a)^(t)^(t>>(16-(n))))\
> 
>-static char shifts2[16] = {0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0};
>+static const char shifts2[16] = {0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0};
> 
> void _XdmcpAuthSetup(auth_cblock key, auth_wrapper_schedule schedule)
> {
>Index: lib/font/util/utilbitmap.c
>===================================================================
>RCS file: /cvs/xorg/xc/lib/font/util/utilbitmap.c,v
>retrieving revision 1.3
>diff -u -d -r1.3 utilbitmap.c
>--- lib/font/util/utilbitmap.c	10 Nov 2004 07:46:26 -0000	1.3
>+++ lib/font/util/utilbitmap.c	12 May 2005 04:46:50 -0000
>@@ -35,7 +35,7 @@
> 
> /* Utility functions for reformating font bitmaps */
> 
>-static unsigned char _reverse_byte[0x100] = {
>+static const unsigned char _reverse_byte[0x100] = {
> 	0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
> 	0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
> 	0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
>Index: lib/lbxutil/image/lbxbwcodes.h
>===================================================================
>RCS file: /cvs/xorg/xc/lib/lbxutil/image/lbxbwcodes.h,v
>retrieving revision 1.2
>diff -u -d -r1.2 lbxbwcodes.h
>--- lib/lbxutil/image/lbxbwcodes.h	23 Apr 2004 18:44:25 -0000	1.2
>+++ lib/lbxutil/image/lbxbwcodes.h	12 May 2005 04:46:50 -0000
>@@ -39,7 +39,7 @@
> #define TIFFFaxWhiteCodes Darwin_X_TIFFFaxWhiteCodes
> #endif
> #endif
>-tableentry TIFFFaxWhiteCodes[] = {
>+const tableentry TIFFFaxWhiteCodes[] = {
>     { 8, 0x35, 0 },	/* 0011 0101 */
>     { 6, 0x7, 1 },	/* 0001 11 */
>     { 4, 0x7, 2 },	/* 0111 */
>@@ -156,7 +156,7 @@
> #define TIFFFaxBlackCodes Darwin_X_TIFFFaxBlackCodes
> #endif
> #endif
>-tableentry TIFFFaxBlackCodes[] = {
>+const tableentry TIFFFaxBlackCodes[] = {
>     { 10, 0x37, 0 },	/* 0000 1101 11 */
>     { 3, 0x2, 1 },	/* 010 */
>     { 2, 0x3, 2 },	/* 11 */
>Index: lib/lbxutil/image/lbxfax.h
>===================================================================
>RCS file: /cvs/xorg/xc/lib/lbxutil/image/lbxfax.h,v
>retrieving revision 1.2
>diff -u -d -r1.2 lbxfax.h
>--- lib/lbxutil/image/lbxfax.h	23 Apr 2004 18:44:25 -0000	1.2
>+++ lib/lbxutil/image/lbxfax.h	12 May 2005 04:46:50 -0000
>@@ -52,8 +52,8 @@
> #define TIFFFaxBlackCodes Darwin_X_TIFFFaxBlackCodes
> #endif
> #endif
>-extern tableentry TIFFFaxWhiteCodes[];
>-extern tableentry TIFFFaxBlackCodes[];
>+extern const tableentry TIFFFaxWhiteCodes[];
>+extern const tableentry TIFFFaxBlackCodes[];
> 
> /* misc.c */
> extern int LbxImageFindDiff ( unsigned char *cp, int bs, int be, int color );
>Index: lib/lbxutil/image/misc.c
>===================================================================
>RCS file: /cvs/xorg/xc/lib/lbxutil/image/misc.c,v
>retrieving revision 1.1.1.1
>diff -u -d -r1.1.1.1 misc.c
>--- lib/lbxutil/image/misc.c	14 Nov 2003 16:48:50 -0000	1.1.1.1
>+++ lib/lbxutil/image/misc.c	12 May 2005 04:46:50 -0000
>@@ -30,7 +30,7 @@
> 
> #include "lbxfax.h"
> 
>-static unsigned char zeroruns[256] = {
>+static const unsigned char zeroruns[256] = {
>     8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,	/* 0x00 - 0x0f */
>     3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,	/* 0x10 - 0x1f */
>     2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,	/* 0x20 - 0x2f */
>@@ -49,7 +49,7 @@
>     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/* 0xf0 - 0xff */
> };
> 
>-static unsigned char oneruns[256] = {
>+static const unsigned char oneruns[256] = {
>     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/* 0x00 - 0x0f */
>     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/* 0x10 - 0x1f */
>     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/* 0x20 - 0x2f */
>@@ -69,7 +69,7 @@
> };
> 
> 
>-static unsigned char BitRevTable[256] = {
>+static const unsigned char BitRevTable[256] = {
>     0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
>     0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
>     0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
>Index: lib/xkbfile/cout.c
>===================================================================
>RCS file: /cvs/xorg/xc/lib/xkbfile/cout.c,v
>retrieving revision 1.2
>diff -u -d -r1.2 cout.c
>--- lib/xkbfile/cout.c	23 Apr 2004 18:44:26 -0000	1.2
>+++ lib/xkbfile/cout.c	12 May 2005 04:46:51 -0000
>@@ -249,7 +249,7 @@
> 	fprintf(file,"/* compat name is \"%s\" */\n",
> 				XkbAtomText(dpy,xkb->names->compat,XkbCFile));
>     }
>-    fprintf(file,"static XkbSymInterpretRec dfltSI[%d]= {\n",
>+    fprintf(file,"static const XkbSymInterpretRec dfltSI[%d]= {\n",
> 						compat->num_si);
>     interp= compat->sym_interpret;
>     for (i=0;i<compat->num_si;i++,interp++) {
>Index: programs/Xserver/hw/dmx/input/lnx-keyboard.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/dmx/input/lnx-keyboard.c,v
>retrieving revision 1.2
>diff -u -d -r1.2 lnx-keyboard.c
>--- programs/Xserver/hw/dmx/input/lnx-keyboard.c	20 Apr 2005 12:25:20 -0000	1.2
>+++ programs/Xserver/hw/dmx/input/lnx-keyboard.c	12 May 2005 04:46:51 -0000
>@@ -212,7 +212,7 @@
>     else                  priv->kbdState[byte] &= ~bit;
> }
> 
>-static KeySym linux_to_x[256] = {
>+static const KeySym linux_to_x[256] = {
> 	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
> 	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
> 	XK_BackSpace,	XK_Tab,		XK_Linefeed,	NoSymbol,
>@@ -282,7 +282,7 @@
> /*
>  * Maps the AT keycodes to Linux keycodes
>  */
>-static unsigned char at2lnx[NUM_KEYCODES] =
>+static const unsigned char at2lnx[NUM_KEYCODES] =
> {
> 	0x01,	/* KEY_Escape */	0x02,	/* KEY_1 */
> 	0x03,	/* KEY_2 */		0x04,	/* KEY_3 */
>Index: programs/Xserver/hw/xfree86/common/xf86.h
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86.h,v
>retrieving revision 1.4
>diff -u -d -r1.4 xf86.h
>--- programs/Xserver/hw/xfree86/common/xf86.h	2 Dec 2004 21:58:58 -0000	1.4
>+++ programs/Xserver/hw/xfree86/common/xf86.h	12 May 2005 04:46:51 -0000
>@@ -84,7 +84,7 @@
> 
> /* variables for debugging */
> #ifdef BUILDDEBUG
>-extern char* xf86p8bit[];
>+extern const char xf86p8bit[][9];
> extern CARD32 xf86DummyVar1;
> extern CARD32 xf86DummyVar2;
> extern CARD32 xf86DummyVar3;
>Index: programs/Xserver/hw/xfree86/common/xf86Debug.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Debug.c,v
>retrieving revision 1.2
>diff -u -d -r1.2 xf86Debug.c
>--- programs/Xserver/hw/xfree86/common/xf86Debug.c	20 Apr 2005 12:25:21 -0000	1.2
>+++ programs/Xserver/hw/xfree86/common/xf86Debug.c	12 May 2005 04:46:51 -0000
>@@ -52,7 +52,8 @@
> {
> }
> 
>-char *xf86p8bit[] = { "00000000", "00000001", "00000010", "00000011", 
>+const char xf86p8bit[][9] = {
>+                      "00000000", "00000001", "00000010", "00000011", 
> 		      "00000100", "00000101", "00000110", "00000111", 
> 		      "00001000", "00001001", "00001010", "00001011", 
> 		      "00001100", "00001101", "00001110", "00001111", 
>Index: programs/Xserver/hw/xfree86/common/xf86DefModes.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86DefModes.c,v
>retrieving revision 1.2
>diff -u -d -r1.2 xf86DefModes.c
>--- programs/Xserver/hw/xfree86/common/xf86DefModes.c	23 Apr 2004 19:20:32 -0000	1.2
>+++ programs/Xserver/hw/xfree86/common/xf86DefModes.c	12 May 2005 04:46:51 -0000
>@@ -22,7 +22,7 @@
> #define MODEPREFIX(name) NULL, NULL, name, MODE_OK, M_T_DEFAULT
> #define MODESUFFIX       0,0, 0,0,0,0,0,0,0, 0,0,0,0,0,0,FALSE,FALSE,0,NULL,0,0.0,0.0
> 
>-DisplayModeRec xf86DefaultModes [] = {
>+const DisplayModeRec xf86DefaultModes [] = {
> /* 640x350 @ 85Hz (VESA) hsync: 37.9kHz */
> 	{MODEPREFIX("640x350"),31500, 640,672,736,832,0, 350,382,385,445,0, V_PHSYNC | V_NVSYNC, MODESUFFIX},
> 	{MODEPREFIX("320x175"),15750, 320,336,368,416,0, 175,191,192,222,0, V_PHSYNC | V_NVSYNC | V_DBLSCAN, MODESUFFIX},
>Index: programs/Xserver/hw/xfree86/common/xf86KbdLnx.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86KbdLnx.c,v
>retrieving revision 1.2
>diff -u -d -r1.2 xf86KbdLnx.c
>--- programs/Xserver/hw/xfree86/common/xf86KbdLnx.c	20 Apr 2005 12:25:21 -0000	1.2
>+++ programs/Xserver/hw/xfree86/common/xf86KbdLnx.c	12 May 2005 04:46:51 -0000
>@@ -165,7 +165,7 @@
> 
> #include <linux/keyboard.h>
> 
>-static KeySym linux_to_x[256] = {
>+static const KeySym linux_to_x[256] = {
> 	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
> 	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
> 	XK_BackSpace,	XK_Tab,		XK_Linefeed,	NoSymbol,
>@@ -235,7 +235,7 @@
> /*
>  * Maps the AT keycodes to Linux keycodes
>  */
>-static unsigned char at2lnx[NUM_KEYCODES] =
>+static const unsigned char at2lnx[NUM_KEYCODES] =
> {
> 	0x01,	/* KEY_Escape */	0x02,	/* KEY_1 */
> 	0x03,	/* KEY_2 */		0x04,	/* KEY_3 */
>Index: programs/Xserver/hw/xfree86/common/xf86Keymap.h
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Keymap.h,v
>retrieving revision 1.1.1.2
>diff -u -d -r1.1.1.2 xf86Keymap.h
>--- programs/Xserver/hw/xfree86/common/xf86Keymap.h	25 Nov 2003 19:28:33 -0000	1.1.1.2
>+++ programs/Xserver/hw/xfree86/common/xf86Keymap.h	12 May 2005 04:46:52 -0000
>@@ -34,7 +34,7 @@
>  */
> /* $XConsortium: xf86Keymap.h /main/14 1996/02/21 17:38:47 kaleb $ */
> 
>-static KeySym map[NUM_KEYCODES * GLYPHS_PER_KEY] = {
>+static const KeySym map[NUM_KEYCODES * GLYPHS_PER_KEY] = {
> 
> #if !defined(__SOL8__) && (!defined(sun) || defined(i386))
> 
>Index: programs/Xserver/hw/xfree86/common/xf86Priv.h
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Priv.h,v
>retrieving revision 1.3
>diff -u -d -r1.3 xf86Priv.h
>--- programs/Xserver/hw/xfree86/common/xf86Priv.h	28 Jan 2005 16:12:58 -0000	1.3
>+++ programs/Xserver/hw/xfree86/common/xf86Priv.h	12 May 2005 04:46:52 -0000
>@@ -162,7 +162,7 @@
> 
> /* xf86DefaultModes */
> 
>-extern DisplayModeRec xf86DefaultModes [];
>+extern const DisplayModeRec xf86DefaultModes [];
> 
> /* xf86DoScanPci.c */
> 
>Index: programs/Xserver/hw/xfree86/loader/dixsym.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v
>retrieving revision 1.9
>diff -u -d -r1.9 dixsym.c
>--- programs/Xserver/hw/xfree86/loader/dixsym.c	20 Apr 2005 12:25:34 -0000	1.9
>+++ programs/Xserver/hw/xfree86/loader/dixsym.c	12 May 2005 04:46:52 -0000
>@@ -93,7 +93,7 @@
> 
> /* DIX things */
> 
>-LOOKUP dixLookupTab[] = {
>+const LOOKUP dixLookupTab[] = {
> 
>     /* dix */
>     /* atom.c */
>Index: programs/Xserver/hw/xfree86/loader/fontsym.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/loader/fontsym.c,v
>retrieving revision 1.1.1.3
>diff -u -d -r1.1.1.3 fontsym.c
>--- programs/Xserver/hw/xfree86/loader/fontsym.c	29 Jan 2004 08:08:46 -0000	1.1.1.3
>+++ programs/Xserver/hw/xfree86/loader/fontsym.c	12 May 2005 04:46:52 -0000
>@@ -42,7 +42,7 @@
> #include "fontcache.h"
> #endif
> 
>-LOOKUP fontLookupTab[] = {
>+const LOOKUP fontLookupTab[] = {
> 
>     SYMFUNC(TwoByteSwap)
>     SYMFUNC(FourByteSwap)
>Index: programs/Xserver/hw/xfree86/loader/misym.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/loader/misym.c,v
>retrieving revision 1.2
>diff -u -d -r1.2 misym.c
>--- programs/Xserver/hw/xfree86/loader/misym.c	23 Apr 2004 19:54:06 -0000	1.2
>+++ programs/Xserver/hw/xfree86/loader/misym.c	12 May 2005 04:46:52 -0000
>@@ -77,7 +77,7 @@
> 
> extern miPointerSpriteFuncRec miSpritePointerFuncs;
> 
>-LOOKUP miLookupTab[] = {
>+const LOOKUP miLookupTab[] = {
>     SYMFUNC(miClearToBackground)
>     SYMFUNC(miSendGraphicsExpose)
>     SYMFUNC(miModifyPixmapHeader)
>Index: programs/Xserver/hw/xfree86/loader/xf86sym.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/loader/xf86sym.c,v
>retrieving revision 1.10
>diff -u -d -r1.10 xf86sym.c
>--- programs/Xserver/hw/xfree86/loader/xf86sym.c	22 Apr 2005 16:49:21 -0000	1.10
>+++ programs/Xserver/hw/xfree86/loader/xf86sym.c	12 May 2005 04:46:52 -0000
>@@ -243,7 +243,7 @@
> 
> /* XFree86 things */
> 
>-LOOKUP xfree86LookupTab[] = {
>+const LOOKUP xfree86LookupTab[] = {
> 
>     /* Public OSlib functions */
>     SYMFUNC(xf86ReadBIOS)
>Index: programs/Xserver/hw/xfree86/os-support/linux/lnx_KbdMap.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_KbdMap.c,v
>retrieving revision 1.3
>diff -u -d -r1.3 lnx_KbdMap.c
>--- programs/Xserver/hw/xfree86/os-support/linux/lnx_KbdMap.c	20 Apr 2005 12:25:35 -0000	1.3
>+++ programs/Xserver/hw/xfree86/os-support/linux/lnx_KbdMap.c	12 May 2005 04:46:52 -0000
>@@ -107,7 +107,7 @@
> 
> #include <linux/keyboard.h>
> 
>-static KeySym linux_to_x[256] = {
>+static const KeySym linux_to_x[256] = {
> 	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
> 	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
> 	XK_BackSpace,	XK_Tab,		XK_Linefeed,	NoSymbol,
>@@ -177,7 +177,7 @@
> /*
>  * Maps the AT keycodes to Linux keycodes
>  */
>-static unsigned char at2lnx[NUM_KEYCODES] =
>+static const unsigned char at2lnx[NUM_KEYCODES] =
> {
> 	0x01,	/* KEY_Escape */	0x02,	/* KEY_1 */
> 	0x03,	/* KEY_2 */		0x04,	/* KEY_3 */
>Index: programs/Xserver/xkb/xkbDflts.h
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/xkb/xkbDflts.h,v
>retrieving revision 1.2
>diff -u -d -r1.2 xkbDflts.h
>--- programs/Xserver/xkb/xkbDflts.h	23 Apr 2004 19:54:30 -0000	1.2
>+++ programs/Xserver/xkb/xkbDflts.h	12 May 2005 04:46:53 -0000
>@@ -168,7 +168,7 @@
>     lnames_SHIFT_ALT[1]=	GET_ATOM(dpy,"Shift+Alt");
> }
> /* compat name is "default" */
>-static XkbSymInterpretRec dfltSI[69]= {
>+static const XkbSymInterpretRec dfltSI[69]= {
>     {    XK_ISO_Level2_Latch, 0x0000,
>          XkbSI_LevelOneOnly|XkbSI_Exactly, ShiftMask,
>          255,

Actions: View | Splinter Review

Attachments on bug 3273: 2667 | 2729 | 2804

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.