~ubuntu-branches/ubuntu/precise/xorg-server/precise-updates

« back to all changes in this revision

Viewing changes to hw/xfree86/dixmods/extmod/modinit.c

Tags: 2:1.10.1-2
* Build xserver-xorg-core-udeb on hurd-i386.  Thanks, Samuel Thibault!
* Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
146
146
    for (i = 0; extensionModules[i].name != NULL; i++) {
147
147
        if (opts) {
148
148
            char *s;
149
 
            s = (char *)malloc(strlen(extensionModules[i].name) + 5);
150
 
            if (s) {
 
149
            if (asprintf(&s, "omit%s", extensionModules[i].name) != -1) {
151
150
                pointer o;
152
 
                strcpy(s, "omit");
153
 
                strcat(s, extensionModules[i].name);
154
151
                o = xf86FindOption(opts, s);
155
152
                free(s);
156
153
                if (o) {