summaryrefslogtreecommitdiff
path: root/server.c
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2012-07-14 22:16:27 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2012-10-02 22:14:45 -0700
commitfdd58cacbb5b93b74ba9ba766e752b922a7c8b9c (patch)
tree67af14b803a62d554d5d4e78befda38a70c30379 /server.c
parent9b9f7c3cacc1d220962fab1b910c6d76e2cd8087 (diff)
downloadxscope-fdd58cacbb5b93b74ba9ba766e752b922a7c8b9c.tar.gz
Convert ILong, IShort, etal to return C99 uint*_t types
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'server.c')
-rw-r--r--server.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/server.c b/server.c
index 3369460..5226a03 100644
--- a/server.c
+++ b/server.c
@@ -138,7 +138,7 @@ pad(long n)
return ((n + 3) & ~0x3);
}
-unsigned long
+uint32_t
ILong(const unsigned char buf[])
{
/* check for byte-swapping */
@@ -147,7 +147,7 @@ ILong(const unsigned char buf[])
return ((((((buf[0] << 8) | buf[1]) << 8) | buf[2]) << 8) | buf[3]);
}
-unsigned short
+uint16_t
IShort(const unsigned char buf[])
{
/* check for byte-swapping */
@@ -156,14 +156,14 @@ IShort(const unsigned char buf[])
return ((buf[0] << 8) | buf[1]);
}
-unsigned short
+uint16_t
IChar2B(const unsigned char buf[])
{
/* CHAR2B is like an IShort, but not byte-swapped */
return ((buf[0] << 8) | buf[1]);
}
-unsigned short
+uint8_t
IByte(const unsigned char buf[])
{
return (buf[0]);