geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s/drmStrdup/strdup/ 

_DRM_MALLOC hasn't been a relevant concern since we split libdrm out
from xserver.

Signed-off-by: Adam Jackson <ajax@redhat.com>
main
Adam Jackson 2010-10-27 18:44:53 -04:00
parent 057fab3382
commit 0a1ff35c70
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
xf86drm.c
View File

@ -155,23 +155,6 @@ void drmFree(void *pt)
free(pt); free(pt);
} }
/* drmStrdup can't use strdup(3), since it doesn't call _DRM_MALLOC... */
static char *drmStrdup(const char *s)
{
char *retval;
if (!s)
return NULL;
retval = malloc(strlen(s)+1);
if (!retval)
return NULL;
strcpy(retval, s);
return retval;
}
/** /**
* Call ioctl, restarting if it is interupted * Call ioctl, restarting if it is interupted
*/ */
@ -726,11 +709,11 @@ static void drmCopyVersion(drmVersionPtr d, const drm_version_t *s)
d->version_minor = s->version_minor; d->version_minor = s->version_minor;
d->version_patchlevel = s->version_patchlevel; d->version_patchlevel = s->version_patchlevel;
d->name_len = s->name_len; d->name_len = s->name_len;
d->name = drmStrdup(s->name); d->name = strdup(s->name);
d->date_len = s->date_len; d->date_len = s->date_len;
d->date = drmStrdup(s->date); d->date = strdup(s->date);
d->desc_len = s->desc_len; d->desc_len = s->desc_len;
d->desc = drmStrdup(s->desc); d->desc = strdup(s->desc);
} }
@ -2543,5 +2526,5 @@ char *drmGetDeviceNameFromFd(int fd)
if (i == DRM_MAX_MINOR) if (i == DRM_MAX_MINOR)
return NULL; return NULL;
return drmStrdup(name); return strdup(name);
} }