diff options
| author | marha <marha@users.sourceforge.net> | 2010-12-10 19:06:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-12-10 19:06:59 +0000 |
| commit | 3a20d23b48c1051e1f22295fd886cc7f643417f6 (patch) | |
| tree | 5192dddd9ecf591de2e22504f7268c2935382d90 /xorg-server/hw/xfree86/dixmods/extmod | |
| parent | 531a0d974b98074978535f086a73b6b662fa0cea (diff) | |
| download | vcxsrv-3a20d23b48c1051e1f22295fd886cc7f643417f6.tar.gz vcxsrv-3a20d23b48c1051e1f22295fd886cc7f643417f6.tar.bz2 vcxsrv-3a20d23b48c1051e1f22295fd886cc7f643417f6.zip | |
xserver git update 10/12/2010
Diffstat (limited to 'xorg-server/hw/xfree86/dixmods/extmod')
| -rw-r--r-- | xorg-server/hw/xfree86/dixmods/extmod/modinit.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/xorg-server/hw/xfree86/dixmods/extmod/modinit.c b/xorg-server/hw/xfree86/dixmods/extmod/modinit.c index c0c17d722..ee3e52855 100644 --- a/xorg-server/hw/xfree86/dixmods/extmod/modinit.c +++ b/xorg-server/hw/xfree86/dixmods/extmod/modinit.c @@ -146,11 +146,8 @@ extmodSetup(pointer module, pointer opts, int *errmaj, int *errmin) for (i = 0; extensionModules[i].name != NULL; i++) {
if (opts) {
char *s;
- s = (char *)malloc(strlen(extensionModules[i].name) + 5);
- if (s) {
+ if (Xasprinf(&s, "omit%s", extensionModules[i].name) != -1) {
pointer o;
- strcpy(s, "omit");
- strcat(s, extensionModules[i].name);
o = xf86FindOption(opts, s);
free(s);
if (o) {
|