svn commit: r212665 - head/libexec/tftpd

[Warner Losh]

Author: imp
Date: Wed Sep 15 15:38:47 2010
New Revision: 212665
URL: http://svn.freebsd.org/changeset/base/212665

Log:
  Move the pfrom initialization from before the setjmp to after the
  setjmp to avoid warnings on the powerpc build...

Modified:
  head/libexec/tftpd/tftp-io.c

Modified: head/libexec/tftpd/tftp-io.c
==============================================================================
--- head/libexec/tftpd/tftp-io.c	Wed Sep 15 15:33:51 2010	(r212664)
+++ head/libexec/tftpd/tftp-io.c	Wed Sep 15 15:38:47 2010	(r212665)
@@ -398,8 +398,6 @@ receive_packet(int peer, char *data, int
 	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
 	}
 
 	waiting++;
+	pfrom = (from == NULL) ? &from_local : from;
 	fromlen = sizeof(*pfrom);
 	n = recvfrom(peer, data, size, 0, (struct sockaddr *)pfrom, &fromlen);