Deal with lint warnings about implicit narrowing conversions

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Alan Coopersmith
2010-04-29 20:19:38 -07:00
parent 110078a137
commit 30e388a828
9 changed files with 49 additions and 10 deletions

7
AA16.c
View File

@@ -36,16 +36,21 @@ in this Software without prior written authorization from The Open Group.
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xmd.h> #include <X11/Xmd.h>
#include <X11/Xdmcp.h> #include <X11/Xdmcp.h>
#include <limits.h>
int int
XdmcpAllocARRAY16 (ARRAY16Ptr array, int length) XdmcpAllocARRAY16 (ARRAY16Ptr array, int length)
{ {
CARD16Ptr newData; CARD16Ptr newData;
/* length defined in ARRAY16 struct is a CARD8 */
if (length > UINT8_MAX)
return FALSE;
newData = (CARD16Ptr) Xalloc (length * sizeof (CARD16)); newData = (CARD16Ptr) Xalloc (length * sizeof (CARD16));
if (!newData) if (!newData)
return FALSE; return FALSE;
array->length = length; array->length = (CARD8) length;
array->data = newData; array->data = newData;
return TRUE; return TRUE;
} }

7
AA32.c
View File

@@ -36,16 +36,21 @@ in this Software without prior written authorization from The Open Group.
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xmd.h> #include <X11/Xmd.h>
#include <X11/Xdmcp.h> #include <X11/Xdmcp.h>
#include <limits.h>
int int
XdmcpAllocARRAY32 (ARRAY32Ptr array, int length) XdmcpAllocARRAY32 (ARRAY32Ptr array, int length)
{ {
CARD32Ptr newData; CARD32Ptr newData;
/* length defined in ARRAY32 struct is a CARD8 */
if (length > UINT8_MAX)
return FALSE;
newData = (CARD32Ptr) Xalloc (length * sizeof (CARD32)); newData = (CARD32Ptr) Xalloc (length * sizeof (CARD32));
if (!newData) if (!newData)
return FALSE; return FALSE;
array->length = length; array->length = (CARD8) length;
array->data = newData; array->data = newData;
return TRUE; return TRUE;
} }

7
AA8.c
View File

@@ -36,16 +36,21 @@ in this Software without prior written authorization from The Open Group.
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xmd.h> #include <X11/Xmd.h>
#include <X11/Xdmcp.h> #include <X11/Xdmcp.h>
#include <limits.h>
int int
XdmcpAllocARRAY8 (ARRAY8Ptr array, int length) XdmcpAllocARRAY8 (ARRAY8Ptr array, int length)
{ {
CARD8Ptr newData; CARD8Ptr newData;
/* length defined in ARRAY8 struct is a CARD16 (not CARD8 like the rest) */
if (length > UINT16_MAX)
return FALSE;
newData = (CARD8Ptr) Xalloc (length * sizeof (CARD8)); newData = (CARD8Ptr) Xalloc (length * sizeof (CARD8));
if (!newData) if (!newData)
return FALSE; return FALSE;
array->length = length; array->length = (CARD16) length;
array->data = newData; array->data = newData;
return TRUE; return TRUE;
} }

View File

@@ -36,16 +36,21 @@ in this Software without prior written authorization from The Open Group.
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xmd.h> #include <X11/Xmd.h>
#include <X11/Xdmcp.h> #include <X11/Xdmcp.h>
#include <limits.h>
int int
XdmcpAllocARRAYofARRAY8 (ARRAYofARRAY8Ptr array, int length) XdmcpAllocARRAYofARRAY8 (ARRAYofARRAY8Ptr array, int length)
{ {
ARRAY8Ptr newData; ARRAY8Ptr newData;
/* length defined in ARRAYofARRAY8 struct is a CARD8 */
if (length > UINT8_MAX)
return FALSE;
newData = (ARRAY8Ptr) Xalloc (length * sizeof (ARRAY8)); newData = (ARRAY8Ptr) Xalloc (length * sizeof (ARRAY8));
if (!newData) if (!newData)
return FALSE; return FALSE;
array->length = length; array->length = (CARD8) length;
array->data = newData; array->data = newData;
return TRUE; return TRUE;
} }

View File

@@ -38,7 +38,7 @@ in this Software without prior written authorization from The Open Group.
int int
XdmcpReadARRAYofARRAY8 (XdmcpBufferPtr buffer, ARRAYofARRAY8Ptr array) XdmcpReadARRAYofARRAY8 (XdmcpBufferPtr buffer, ARRAYofARRAY8Ptr array)
{ {
int i; CARD8 i;
if (!XdmcpReadCARD8 (buffer, &array->length)) { if (!XdmcpReadCARD8 (buffer, &array->length)) {
@@ -56,7 +56,7 @@ XdmcpReadARRAYofARRAY8 (XdmcpBufferPtr buffer, ARRAYofARRAY8Ptr array)
array->data = (ARRAY8 *) Xalloc (array->length * sizeof (ARRAY8)); array->data = (ARRAY8 *) Xalloc (array->length * sizeof (ARRAY8));
if (!array->data) if (!array->data)
return FALSE; return FALSE;
for (i = 0; i < (int)array->length; i++) for (i = 0; i < array->length; i++)
{ {
if (!XdmcpReadARRAY8 (buffer, &array->data[i])) if (!XdmcpReadARRAY8 (buffer, &array->data[i]))
{ {

View File

@@ -36,16 +36,20 @@ in this Software without prior written authorization from The Open Group.
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xmd.h> #include <X11/Xmd.h>
#include <X11/Xdmcp.h> #include <X11/Xdmcp.h>
#include <limits.h>
int int
XdmcpReallocARRAY16 (ARRAY16Ptr array, int length) XdmcpReallocARRAY16 (ARRAY16Ptr array, int length)
{ {
CARD16Ptr newData; CARD16Ptr newData;
/* length defined in ARRAY16 struct is a CARD8 */
if (length > UINT8_MAX)
return FALSE;
newData = (CARD16Ptr) Xrealloc (array->data, length * sizeof (CARD16)); newData = (CARD16Ptr) Xrealloc (array->data, length * sizeof (CARD16));
if (!newData) if (!newData)
return FALSE; return FALSE;
array->length = length; array->length = (CARD8) length;
array->data = newData; array->data = newData;
return TRUE; return TRUE;
} }

View File

@@ -36,16 +36,21 @@ in this Software without prior written authorization from The Open Group.
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xmd.h> #include <X11/Xmd.h>
#include <X11/Xdmcp.h> #include <X11/Xdmcp.h>
#include <limits.h>
int int
XdmcpReallocARRAY32 (ARRAY32Ptr array, int length) XdmcpReallocARRAY32 (ARRAY32Ptr array, int length)
{ {
CARD32Ptr newData; CARD32Ptr newData;
/* length defined in ARRAY32 struct is a CARD8 */
if (length > UINT8_MAX)
return FALSE;
newData = (CARD32Ptr) Xrealloc (array->data, length * sizeof (CARD32)); newData = (CARD32Ptr) Xrealloc (array->data, length * sizeof (CARD32));
if (!newData) if (!newData)
return FALSE; return FALSE;
array->length = length; array->length = (CARD8) length;
array->data = newData; array->data = newData;
return TRUE; return TRUE;
} }

7
RaA8.c
View File

@@ -36,16 +36,21 @@ in this Software without prior written authorization from The Open Group.
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xmd.h> #include <X11/Xmd.h>
#include <X11/Xdmcp.h> #include <X11/Xdmcp.h>
#include <limits.h>
int int
XdmcpReallocARRAY8 (ARRAY8Ptr array, int length) XdmcpReallocARRAY8 (ARRAY8Ptr array, int length)
{ {
CARD8Ptr newData; CARD8Ptr newData;
/* length defined in ARRAY8 struct is a CARD16 (not CARD8 like the rest) */
if (length > UINT16_MAX)
return FALSE;
newData = (CARD8Ptr) Xrealloc (array->data, length * sizeof (CARD8)); newData = (CARD8Ptr) Xrealloc (array->data, length * sizeof (CARD8));
if (!newData) if (!newData)
return FALSE; return FALSE;
array->length = length; array->length = (CARD16) length;
array->data = newData; array->data = newData;
return TRUE; return TRUE;
} }

View File

@@ -36,16 +36,21 @@ in this Software without prior written authorization from The Open Group.
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xmd.h> #include <X11/Xmd.h>
#include <X11/Xdmcp.h> #include <X11/Xdmcp.h>
#include <limits.h>
int int
XdmcpReallocARRAYofARRAY8 (ARRAYofARRAY8Ptr array, int length) XdmcpReallocARRAYofARRAY8 (ARRAYofARRAY8Ptr array, int length)
{ {
ARRAY8Ptr newData; ARRAY8Ptr newData;
/* length defined in ARRAYofARRAY8 struct is a CARD8 */
if (length > UINT8_MAX)
return FALSE;
newData = (ARRAY8Ptr) Xrealloc (array->data, length * sizeof (ARRAY8)); newData = (ARRAY8Ptr) Xrealloc (array->data, length * sizeof (ARRAY8));
if (!newData) if (!newData)
return FALSE; return FALSE;
array->length = length; array->length = (CARD8) length;
array->data = newData; array->data = newData;
return TRUE; return TRUE;
} }