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/xf86sbusBus.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/xf86sbusBus.c')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86sbusBus.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86sbusBus.c b/xorg-server/hw/xfree86/common/xf86sbusBus.c index f9244bca7..c0de88dda 100644 --- a/xorg-server/hw/xfree86/common/xf86sbusBus.c +++ b/xorg-server/hw/xfree86/common/xf86sbusBus.c @@ -706,11 +706,9 @@ xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus, GDevRec *GDev) sparcPromClose();
}
if (promPath) {
- GDev->busID = xnfalloc(strlen(promPath) + 6);
- sprintf(GDev->busID, "SBUS:%s", promPath);
+ XNFasprintf(&GDev->busID, "SBUS:%s", promPath);
free(promPath);
} else {
- GDev->busID = xnfalloc(12);
- sprintf(GDev->busID, "SBUS:fb%d", sBus->fbNum);
+ XNFsprintf(&GDev->busID, "SBUS:fb%d", sBus->fbNum);
}
}
|