diff options
| author | marha <marha@users.sourceforge.net> | 2010-09-11 09:26:35 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-09-11 09:26:35 +0000 |
| commit | 35b29c19707341bbfa32f7f6136ce09e59cb332c (patch) | |
| tree | a795242657a2b96a463a11774517472fa4c64953 /xorg-server/Xi | |
| parent | ba6498fea6d935aff0856f9851cb47d5657952fa (diff) | |
| parent | e172c89783326e2378e4793ff31a0f44210c5534 (diff) | |
| download | vcxsrv-35b29c19707341bbfa32f7f6136ce09e59cb332c.tar.gz vcxsrv-35b29c19707341bbfa32f7f6136ce09e59cb332c.tar.bz2 vcxsrv-35b29c19707341bbfa32f7f6136ce09e59cb332c.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/Xi')
| -rw-r--r-- | xorg-server/Xi/extinit.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/xorg-server/Xi/extinit.c b/xorg-server/Xi/extinit.c index 58943f08d..dd72ee2b0 100644 --- a/xorg-server/Xi/extinit.c +++ b/xorg-server/Xi/extinit.c @@ -1154,8 +1154,7 @@ void AssignTypeAndName(DeviceIntPtr dev, Atom type, char *name)
{
dev->xinput_type = type;
- dev->name = (char *)malloc(strlen(name) + 1);
- strcpy(dev->name, name);
+ dev->name = strdup(name);
}
/***********************************************************************
|