Fix some sign/size conversion warnings from clang

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

7 files changed, 16 insertions, 16 deletions

diff --git a/src/FSErrDis.c b/src/FSErrDis.c
index 76ebab6..bffe2b5 100644
--- a/src/FSErrDis.c
+++ b/src/FSErrDis.c
@@ -70,7 +70,7 @@ static const char *FSErrorList[] = {
      /* FSBadLength	 */ "BadLength, request too large or internal FSlib length error",
      /* FSBadImplementation */ "BadImplementation, request unsupported",
 };
-static int FSErrorListSize = sizeof(FSErrorList);
+#define FSErrorListSize sizeof(FSErrorList)
 
 
 /* ARGSUSED */
diff --git a/src/FSFtNames.c b/src/FSFtNames.c
index 1cac9d4..732040f 100644
--- a/src/FSFtNames.c
+++ b/src/FSFtNames.c
@@ -62,13 +62,13 @@ FSListFonts(
     int		*actualCount)
 {
     long        nbytes;
-    int         i,
+    unsigned int i,
                 length;
     char      **flist;
     char       *c;
     fsListFontsReply rep;
     fsListFontsReq *req;
-    long        rlen;
+    unsigned long rlen;
 
     GetReq(ListFonts, req);
     req->maxNames = maxNames;
@@ -94,11 +94,11 @@ FSListFonts(
 		FSfree(flist);
 	    if (c)
 		FSfree(c);
-	    _FSEatData(svr, (unsigned long) rlen);
+	    _FSEatData(svr, rlen);
 	    SyncHandle();
 	    return (char **) NULL;
 	}
-	_FSReadPad(svr, c, rlen);
+	_FSReadPad(svr, c, (long) rlen);
 	/* unpack */
 	length = *(unsigned char *)c;
 	for (i = 0; i < rep.nFonts; i++) {
diff --git a/src/FSGetCats.c b/src/FSGetCats.c
index 75f8c36..d8fae40 100644
--- a/src/FSGetCats.c
+++ b/src/FSGetCats.c
@@ -65,7 +65,7 @@ FSGetCatalogues(
     int         i,
                 length;
     fsReq      *req;
-    long        rlen;
+    unsigned long rlen;
 
     GetEmptyReq(GetCatalogues, req);
 
@@ -87,11 +87,11 @@ FSGetCatalogues(
 		FSfree(list);
 	    if (c)
 		FSfree(c);
-	    _FSEatData(svr, (unsigned long) rlen);
+	    _FSEatData(svr, rlen);
 	    SyncHandle();
 	    return (char **) NULL;
 	}
-	_FSReadPad(svr, c, rlen);
+	_FSReadPad(svr, c, (long) rlen);
 	/*
 	 * unpack the strings
 	 */
diff --git a/src/FSListCats.c b/src/FSListCats.c
index 89fb2e4..e4aa5ed 100644
--- a/src/FSListCats.c
+++ b/src/FSListCats.c
@@ -68,7 +68,7 @@ FSListCatalogues(
     char       *c;
     fsListCataloguesReply rep;
     fsListCataloguesReq *req;
-    long        rlen;
+    unsigned long rlen;
 
     GetReq(ListCatalogues, req);
     req->maxNames = maxNames;
@@ -94,11 +94,11 @@ FSListCatalogues(
 		FSfree(clist);
 	    if (c)
 		FSfree(c);
-	    _FSEatData(svr, (unsigned long) rlen);
+	    _FSEatData(svr, rlen);
 	    SyncHandle();
 	    return (char **) NULL;
 	}
-	_FSReadPad(svr, c, rlen);
+	_FSReadPad(svr, c, (long) rlen);
 	/* unpack */
 	length = *c;
 	for (i = 0; i < rep.num_catalogues; i++) {
diff --git a/src/FSListExt.c b/src/FSListExt.c
index c127003..8d83bd3 100644
--- a/src/FSListExt.c
+++ b/src/FSListExt.c
@@ -65,7 +65,7 @@ FSListExtensions(
     int         i,
                 length;
     fsReq      *req;
-    long        rlen;
+    unsigned long rlen;
 
     GetEmptyReq(ListExtensions, req);
 
@@ -87,11 +87,11 @@ FSListExtensions(
 		FSfree(list);
 	    if (c)
 		FSfree(c);
-	    _FSEatData(svr, (unsigned long) rlen);
+	    _FSEatData(svr, rlen);
 	    SyncHandle();
 	    return (char **) NULL;
 	}
-	_FSReadPad(svr, c, rlen);
+	_FSReadPad(svr, c, (long) rlen);
 	/*
 	 * unpack the strings
 	 */
diff --git a/src/FSlibInt.c b/src/FSlibInt.c
index 090da3f..5b4a773 100644
--- a/src/FSlibInt.c
+++ b/src/FSlibInt.c
@@ -316,7 +316,7 @@ _FSReadPad(
 
     if (size == 0)
 	return;
-    iov[0].iov_len = (int) size;
+    iov[0].iov_len = size;
     iov[0].iov_base = data;
     /*
      * The following hack is used to provide 32 bit long-word aligned padding.
diff --git a/src/FSlibint.h b/src/FSlibint.h
index 5e539be..d68102a 100644
--- a/src/FSlibint.h
+++ b/src/FSlibint.h
@@ -152,7 +152,7 @@ extern FSServer *_FSHeadOfServerList;
 	req = (fsResourceReq *) (svr->last_req = svr->bufptr);\
 	req->reqType = FS_##name;\
 	req->length = 2;\
-	req->id = (rid);\
+	req->id = (CARD32) (rid);\
 	svr->bufptr += SIZEOF(fsResourceReq);\
 	svr->request++