summaryrefslogtreecommitdiffstats
path: root/libexec/tftpd
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2010-09-15 15:38:47 +0000
committerimp <imp@FreeBSD.org>2010-09-15 15:38:47 +0000
commit296fa4d2e72c2c2dc1a8ccfdea097d4ec90bc29a (patch)
treec0e800ea674bd8dcb317d3e9f002cc232847c713 /libexec/tftpd
parent3950b71da67a99e82720e6b092f977876549a0d2 (diff)
downloadFreeBSD-src-296fa4d2e72c2c2dc1a8ccfdea097d4ec90bc29a.zip
FreeBSD-src-296fa4d2e72c2c2dc1a8ccfdea097d4ec90bc29a.tar.gz
Move the pfrom initialization from before the setjmp to after the
setjmp to avoid warnings on the powerpc build...
Diffstat (limited to 'libexec/tftpd')
-rw-r--r--libexec/tftpd/tftp-io.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libexec/tftpd/tftp-io.c b/libexec/tftpd/tftp-io.c
index 28628ba..8a39abd 100644
--- a/libexec/tftpd/tftp-io.c
+++ b/libexec/tftpd/tftp-io.c
@@ -398,8 +398,6 @@ receive_packet(int peer, char *data, int size, struct sockaddr_storage *from,
int n;
static int waiting;
- pfrom = (from == NULL) ? &from_local : from;
-
if (debug&DEBUG_PACKETS)
tftp_log(LOG_DEBUG,
"Waiting %d seconds for packet", timeoutpacket);
@@ -423,6 +421,7 @@ receive_packet(int peer, char *data, int size, struct sockaddr_storage *from,
}
waiting++;
+ pfrom = (from == NULL) ? &from_local : from;
fromlen = sizeof(*pfrom);
n = recvfrom(peer, data, size, 0, (struct sockaddr *)pfrom, &fromlen);
OpenPOWER on IntegriCloud