Handle implicit conversion warnings from clang

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/wrapper/XvMCWrapper.c b/wrapper/XvMCWrapper.c
index 35c74ee..a3004dd 100644
--- a/wrapper/XvMCWrapper.c
+++ b/wrapper/XvMCWrapper.c
@@ -121,8 +121,7 @@ typedef Status (*XvMCBeginSurfaceP) (Display *, XvMCContext *, XvMCSurface *,
 typedef Status (*XvMCLoadQMatrixP) (Display *, XvMCContext *,
                                     const XvMCQMatrix *);
 typedef Status (*XvMCPutSliceP) (Display *, XvMCContext *, char *, int);
-typedef Status (*XvMCPutSlice2P) (Display *, XvMCContext *, char *, int,
-                                  unsigned);
+typedef Status (*XvMCPutSlice2P) (Display *, XvMCContext *, char *, int, int);
 typedef Status (*XvMCGetDRInfoP) (Display *, XvPortID, char **, char **, int *,
                                   int *, int *, int *);
 
@@ -220,7 +219,7 @@ static void *
 dlopenversion(const char *lib, const char *version, int flag)
 {
     void *ret;
-    int curLen, verLen;
+    size_t curLen, verLen;
     char *curName;
 
     curLen = strlen(lib) + (verLen = strlen(version)) + 1;
@@ -230,7 +229,7 @@ dlopenversion(const char *lib, const char *version, int flag)
         const char *tail = strstr(version + 1, ".");
 
         if (NULL != tail) {
-            strncat(curName, version, tail - version);
+            strncat(curName, version, (size_t) (tail - version));
         }
         else {
             strncat(curName, version, verLen);
@@ -282,7 +281,7 @@ initW(Display *dpy, XvPortID port)
     void *handle;
     char *clientName = NULL;
     char *err;
-    int nameLen = 0;
+    size_t nameLen = 0;
 
     wrapperInit = 1;
     xW.initialised = 0;
@@ -332,7 +331,7 @@ initW(Display *dpy, XvPortID port)
          * No. Try to obtain it from the config file.
          */
 
-        int tmp;
+        size_t tmp;
         FILE *configFile;
 
         if (clientName)