Skip to content
Snippets Groups Projects
Commit 61fdd4f7 authored by Kim Phillips's avatar Kim Phillips Committed by Joe Hershberger
Browse files

net/tftp: sparse fixes


tftp.c:464:17: warning: cast to restricted __be16
tftp.c:552:29: warning: cast to restricted __be16
tftp.c:640:33: warning: cast to restricted __be16
tftp.c:642:25: warning: cast to restricted __be16

Signed-off-by: default avatarKim Phillips <kim.phillips@freescale.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
parent 3d49412d
No related branches found
No related tags found
No related merge requests found
...@@ -446,8 +446,8 @@ static void ...@@ -446,8 +446,8 @@ static void
TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src, TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
unsigned len) unsigned len)
{ {
ushort proto; __be16 proto;
ushort *s; __be16 *s;
int i; int i;
if (dest != TftpOurPort) { if (dest != TftpOurPort) {
...@@ -465,7 +465,7 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src, ...@@ -465,7 +465,7 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
return; return;
len -= 2; len -= 2;
/* warning: don't use increment (++) in ntohs() macros!! */ /* warning: don't use increment (++) in ntohs() macros!! */
s = (ushort *)pkt; s = (__be16 *)pkt;
proto = *s++; proto = *s++;
pkt = (uchar *)s; pkt = (uchar *)s;
switch (ntohs(proto)) { switch (ntohs(proto)) {
...@@ -556,7 +556,7 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src, ...@@ -556,7 +556,7 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
if (len < 2) if (len < 2)
return; return;
len -= 2; len -= 2;
TftpBlock = ntohs(*(ushort *)pkt); TftpBlock = ntohs(*(__be16 *)pkt);
update_block_number(); update_block_number();
...@@ -644,9 +644,9 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src, ...@@ -644,9 +644,9 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
case TFTP_ERROR: case TFTP_ERROR:
printf("\nTFTP error: '%s' (%d)\n", printf("\nTFTP error: '%s' (%d)\n",
pkt + 2, ntohs(*(ushort *)pkt)); pkt + 2, ntohs(*(__be16 *)pkt));
switch (ntohs(*(ushort *)pkt)) { switch (ntohs(*(__be16 *)pkt)) {
case TFTP_ERR_FILE_NOT_FOUND: case TFTP_ERR_FILE_NOT_FOUND:
case TFTP_ERR_ACCESS_DENIED: case TFTP_ERR_ACCESS_DENIED:
puts("Not retrying...\n"); puts("Not retrying...\n");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment