On 11/23/11 11:08, Keith Packard wrote:
On Wed, 23 Nov 2011 10:50:13 -0800, Alan
Coopersmith<[email protected]> wrote:
None that I can see, I just hadn't thought about it. I see nothing in
os.h that should break the scanner, and a build with os.h on Solaris has
no problems, so I've amended this patch to do that.
Works on Linux too. Merged.
922c1d8..7b0f53f master -> master
Which actually means it's merged ahead of the commit that would have introduced
the problem, since you hadn't done my pull yet - but that should also prevent
breaking bisects.
I've rebased the rest of the pull on top of master, and squashed in the strndup
test case fix you previously sent, so it should be ready now:
The following changes since commit 7b0f53f0a5824fcd81ef505beb3e19ac7c77961f:
Fix Xdmx build on Linux to work with strlcpy changes (2011-11-23 11:06:34
-0800)
are available in the git repository at:
git://people.freedesktop.org/~alanc/xserver.git master
Alan Coopersmith (32):
Don't fallback to wsfb or fbdev on Solaris
Don't require ld -wrap for tests that don't need it
Enable memory checking during unit testing
Remove a couple Error() instances left behind by 09dbfcb0ad7b6c8
Fix Sun compiler check that got turned around
Add fallback implementation of strndup()
Convert some malloc + strncpy pairs into strndup calls
Convert AllocXTestDevice to use asprintf
Convert strncpy/strncat to strlcpy/strlcat
matchDriverFromFiles: use one snprintf instead of strncpy/cat series
Convert dmxSetDefaultFontPath to use strdup instead of malloc+strncpy
Convert DetermineClientCmd to use strdup instead of malloc+strncpy
Convert ProcRenderQueryFilters to use memcpy instead of strncpy
Make XIGetKnownProperty take a const char * argument
Remove unnecessary variable rtrn in XkbKeysymText
AuthAudit: clean up string handling calls
LogVMessageVerb: Fix const mismatch warning
Convert glx/single2.c:DoGetString() to use asprintf()
Remove bad code from DoShowOptions (Xorg -showopts handler)
Move DoShowOptions to xf86Configure.c, delete xf86ShowOpts.c
Remove xf86FormatPciBusNumber from API, inline the one place its used
Convert a bunch of sprintf to snprintf calls
Reduce unnecessary string copying in xkbtext routines
Mark arguments to fopen/popen/system wrappers as const char *
Mark XKB char * as const to clean up gcc -Wwrite-strings warnings
sun_agp: cast key to uintptr_t before casting to (int *)
Remove redundant redeclarations of functions in the same header file
Fix gcc -Wwrite-strings warnings in XkbGetRulesDflts
Fix gcc -Wwrite-strings warnings in various extensions
FindModule: stop copying const char *dirname to char *dirpath
Fix gcc -Wwrite-strings warnings in xf86 ddx
Fix gcc -Wwrite-strings warnings in xf86Modes code
Jeremy Huddleston (1):
dmx: Build fix for -Werror=implicit-function-declaration
Xext/security.c | 4 +-
Xext/sync.c | 4 +-
Xext/syncsrv.h | 4 +-
Xext/xtest.c | 9 +-
Xext/xvmc.c | 6 +-
Xi/extinit.c | 4 +-
Xi/xiproperty.c | 4 +-
configure.ac | 4 +-
dix/atom.c | 7 +-
dix/devices.c | 2 +-
dix/extension.c | 8 +-
doc/Xserver-spec.xml | 2 +-
exa/exa_render.c | 6 +-
glx/single2.c | 4 +-
hw/dmx/config/dmxcompat.c | 3 +-
hw/dmx/config/scanner.l | 2 +-
hw/dmx/dmxinit.c | 13 +--
hw/dmx/examples/ev.c | 4 +-
hw/dmx/glxProxy/compsize.c | 1 +
hw/dmx/glxProxy/compsize.h | 51 ++++++++
hw/dmx/glxProxy/g_renderswap.c | 1 +
hw/dmx/glxProxy/glxcmds.c | 2 +
hw/dmx/glxProxy/glxcmds.h | 37 ++++++
hw/dmx/glxProxy/glxcmdsswap.c | 3 +
hw/dmx/glxProxy/glxscreens.c | 5 +-
hw/kdrive/ephyr/ephyrhostvideo.c | 9 +-
hw/kdrive/linux/linux.c | 2 +-
hw/kdrive/src/kinput.c | 4 +-
hw/vfb/InitOutput.c | 3 +-
hw/xfree86/common/Makefile.am | 2 +-
hw/xfree86/common/xf86.h | 1 -
hw/xfree86/common/xf86AutoConfig.c | 2 +
hw/xfree86/common/xf86Config.c | 15 +--
hw/xfree86/common/xf86Config.h | 2 +-
hw/xfree86/common/xf86Configure.c | 71 ++++++++++--
hw/xfree86/common/xf86Globals.c | 2 +-
hw/xfree86/common/xf86Mode.c | 4 +-
hw/xfree86/common/xf86Opt.h | 4 +-
hw/xfree86/common/xf86Option.c | 12 +-
hw/xfree86/common/xf86PM.c | 4 +-
hw/xfree86/common/xf86Priv.h | 2 +-
hw/xfree86/common/xf86ShowOpts.c | 130 ---------------------
hw/xfree86/common/xf86Xinput.c | 5 +-
hw/xfree86/common/xf86pciBus.c | 30 ++---
hw/xfree86/common/xf86sbusBus.c | 2 +-
hw/xfree86/ddc/xf86DDC.h | 5 -
hw/xfree86/doc/ddxDesign.xml | 2 +-
hw/xfree86/fbdevhw/fbdevhw.c | 6 +-
hw/xfree86/i2c/msp3430.c | 5 +-
hw/xfree86/loader/loadmod.c | 11 +--
hw/xfree86/modes/xf86Crtc.c | 8 +-
hw/xfree86/modes/xf86Crtc.h | 2 +-
hw/xfree86/modes/xf86EdidModes.c | 2 +-
hw/xfree86/modes/xf86Modes.c | 4 +-
hw/xfree86/os-support/bsd/bsd_init.c | 10 +-
hw/xfree86/os-support/bus/Sbus.c | 12 +-
hw/xfree86/os-support/linux/lnx_init.c | 2 +-
hw/xfree86/os-support/solaris/sun_agp.c | 2 +-
hw/xfree86/parser/Flags.c | 2 +-
hw/xfree86/parser/configProcs.h | 6 +-
hw/xfree86/parser/scan.c | 24 ++--
hw/xfree86/parser/xf86Optrec.h | 2 +-
hw/xfree86/parser/xf86Parser.h | 2 +-
hw/xfree86/ramdac/BTPriv.h | 2 +-
hw/xfree86/ramdac/IBMPriv.h | 2 +-
hw/xfree86/ramdac/TIPriv.h | 2 +-
hw/xfree86/utils/gtf/gtf.c | 4 +-
hw/xfree86/vbe/vbe.c | 2 +-
hw/xfree86/x86emu/debug.c | 2 +-
hw/xquartz/xpr/dri.c | 3 +-
include/dix-config.h.in | 3 +
include/exevents.h | 2 +-
include/extension.h | 4 +-
include/extinit.h | 2 +-
include/extnsionst.h | 4 +-
include/input.h | 4 +-
include/misc.h | 2 +-
include/os.h | 10 +-
include/xkbfile.h | 4 +-
include/xkbsrv.h | 4 +-
mi/miinitext.c | 6 +-
os/Makefile.am | 4 +
os/access.c | 10 +-
os/client.c | 8 +-
os/connection.c | 15 +--
os/log.c | 2 +-
os/osinit.c | 2 +-
os/rpcauth.c | 7 +-
os/strndup.c | 49 ++++++++
os/utils.c | 14 +--
os/xdmcp.c | 4 +-
randr/randrstr.h | 5 -
randr/rrinfo.c | 2 +-
render/filter.c | 6 +-
render/glyphstr.h | 3 -
render/picturestr.h | 6 +-
render/render.c | 4 +-
test/.gitignore | 1 +
test/Makefile.am | 5 +-
test/string.c | 69 +++++++++++
test/xi2/Makefile.am | 10 ++
xkb/ddxList.c | 2 +-
xkb/ddxLoad.c | 6 +-
xkb/maprules.c | 5 +-
xkb/xkbInit.c | 25 +---
xkb/xkbfmisc.c | 2 +-
xkb/xkbout.c | 6 +-
xkb/xkbtext.c | 189 +++++++++++++++----------------
108 files changed, 610 insertions(+), 516 deletions(-)
create mode 100644 hw/dmx/glxProxy/compsize.h
create mode 100644 hw/dmx/glxProxy/glxcmds.h
delete mode 100644 hw/xfree86/common/xf86ShowOpts.c
create mode 100644 os/strndup.c
create mode 100644 test/string.c
--
-Alan Coopersmith- [email protected]
Oracle Solaris Platform Engineering: X Window System
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
