diff options
author | marha <marha@users.sourceforge.net> | 2010-12-12 20:34:06 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-12-12 20:34:06 +0000 |
commit | d3ae6e21a12209f5c8cb8c84ba0f68fb69736844 (patch) | |
tree | 62710b8524ebc7675ebd7f4976fd7f9530ce5df2 /xorg-server/hw/xfree86/common/xf86Init.c | |
parent | 0be679f7724e33c2761ebb67846707fb3351167b (diff) | |
parent | 3a20d23b48c1051e1f22295fd886cc7f643417f6 (diff) | |
download | vcxsrv-d3ae6e21a12209f5c8cb8c84ba0f68fb69736844.tar.gz vcxsrv-d3ae6e21a12209f5c8cb8c84ba0f68fb69736844.tar.bz2 vcxsrv-d3ae6e21a12209f5c8cb8c84ba0f68fb69736844.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86Init.c')
-rw-r--r-- | xorg-server/hw/xfree86/common/xf86Init.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Init.c b/xorg-server/hw/xfree86/common/xf86Init.c index a6740e69f..f3ce3f696 100644 --- a/xorg-server/hw/xfree86/common/xf86Init.c +++ b/xorg-server/hw/xfree86/common/xf86Init.c @@ -536,8 +536,7 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) for (i = 0; i < xf86NumScreens; i++) {
if (xf86Screens[i]->name == NULL) {
- xf86Screens[i]->name = xnfalloc(strlen("screen") + 10 + 1);
- sprintf(xf86Screens[i]->name, "screen%d", i);
+ XNFasprintf(&xf86Screens[i]->name, "screen%d", i);
xf86MsgVerb(X_WARNING, 0,
"Screen driver %d has no name set, using `%s'.\n",
i, xf86Screens[i]->name);
|