[PATCH:libXv 1/7] Remove unnecessary casts from Xmalloc calls

Mark Kettenis mark.kettenis at xs4all.nl
Sun Jun 23 12:53:05 PDT 2013


> From: Alan Coopersmith <alan.coopersmith at oracle.com>
> Date: Sun, 23 Jun 2013 11:53:44 -0700
> 
> Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

Reviewed-by: Mark Kettenis <kettenis at openbsd.org>

> ---
>  src/Xv.c |   14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/src/Xv.c b/src/Xv.c
> index ee80959..5df5464 100644
> --- a/src/Xv.c
> +++ b/src/Xv.c
> @@ -190,7 +190,7 @@ XvQueryAdaptors(
>      }
>  
>      size = rep.length << 2;
> -    if ((buffer = (char *) Xmalloc((unsigned) size)) == NULL) {
> +    if ((buffer = Xmalloc(size)) == NULL) {
>          UnlockDisplay(dpy);
>          SyncHandle();
>          return (XvBadAlloc);
> @@ -206,7 +206,7 @@ XvQueryAdaptors(
>      }
>      else {
>          size = rep.num_adaptors * sizeof(XvAdaptorInfo);
> -        if ((pas = (XvAdaptorInfo *) Xmalloc(size)) == NULL) {
> +        if ((pas = Xmalloc(size)) == NULL) {
>              Xfree(buffer);
>              UnlockDisplay(dpy);
>              SyncHandle();
> @@ -237,7 +237,7 @@ XvQueryAdaptors(
>          size = u.pa->name_size;
>          u.buffer += (sz_xvAdaptorInfo + 3) & ~3;
>  
> -        if ((name = (char *) Xmalloc(size + 1)) == NULL) {
> +        if ((name = Xmalloc(size + 1)) == NULL) {
>              XvFreeAdaptorInfo(pas);
>              Xfree(buffer);
>              UnlockDisplay(dpy);
> @@ -253,7 +253,7 @@ XvQueryAdaptors(
>          /* GET FORMATS */
>  
>          size = pa->num_formats * sizeof(XvFormat);
> -        if ((pfs = (XvFormat *) Xmalloc(size)) == NULL) {
> +        if ((pfs = Xmalloc(size)) == NULL) {
>              XvFreeAdaptorInfo(pas);
>              Xfree(buffer);
>              UnlockDisplay(dpy);
> @@ -346,7 +346,7 @@ XvQueryEncodings(
>      }
>  
>      size = rep.length << 2;
> -    if ((buffer = (char *) Xmalloc((unsigned) size)) == NULL) {
> +    if ((buffer = Xmalloc(size)) == NULL) {
>          UnlockDisplay(dpy);
>          SyncHandle();
>          return (XvBadAlloc);
> @@ -358,7 +358,7 @@ XvQueryEncodings(
>      /* GET ENCODINGS */
>  
>      size = rep.num_encodings * sizeof(XvEncodingInfo);
> -    if ((pes = (XvEncodingInfo *) Xmalloc(size)) == NULL) {
> +    if ((pes = Xmalloc(size)) == NULL) {
>          Xfree(buffer);
>          UnlockDisplay(dpy);
>          SyncHandle();
> @@ -386,7 +386,7 @@ XvQueryEncodings(
>          size = u.pe->name_size;
>          u.buffer += (sz_xvEncodingInfo + 3) & ~3;
>  
> -        if ((name = (char *) Xmalloc(size + 1)) == NULL) {
> +        if ((name = Xmalloc(size + 1)) == NULL) {
>              XvFreeEncodingInfo(pes);
>              Xfree(buffer);
>              UnlockDisplay(dpy);
> -- 
> 1.7.9.2
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
> 


More information about the xorg-devel mailing list