1[ 1436s] ../grub-upstream/netboot/fsys_tftp.c:213: warning: operation on 'block' may be undefined
2[ 1437s] ../grub-upstream/netboot/main.c:444: warning: operation on 'block' may be undefined
3
4[ 1234s] E: xen sequence-point ../grub-upstream/netboot/fsys_tftp.c:213
5[ 1234s] E: xen sequence-point ../grub-upstream/netboot/main.c:444
6
7---
8 netboot/fsys_tftp.c |    5 ++++-
9 netboot/main.c      |    5 ++++-
10 2 files changed, 8 insertions(+), 2 deletions(-)
11
12Index: grub-0.97/netboot/fsys_tftp.c
13===================================================================
14--- grub-0.97.orig/netboot/fsys_tftp.c
15+++ grub-0.97/netboot/fsys_tftp.c
16@@ -209,8 +209,11 @@ buf_fill (int abort)
17 	break;
18
19       if ((block || bcounter) && (block != prevblock + (unsigned short) 1))
20+      {
21+	      block = prevblock;
22 	/* Block order should be continuous */
23-	tp.u.ack.block = htons (block = prevblock);
24+	tp.u.ack.block = htons (block);
25+      }
26
27       /* Should be continuous.  */
28       tp.opcode = abort ? htons (TFTP_ERROR) : htons (TFTP_ACK);
29Index: grub-0.97/netboot/main.c
30===================================================================
31--- grub-0.97.orig/netboot/main.c
32+++ grub-0.97/netboot/main.c
33@@ -440,8 +440,11 @@ tftp (const char *name, int (*fnc) (unsi
34 	break;
35
36       if ((block || bcounter) && (block != prevblock + 1))
37+      {
38+	      block = prevblock;
39 	/* Block order should be continuous */
40-	tp.u.ack.block = htons (block = prevblock);
41+	tp.u.ack.block = htons (block);
42+      }
43
44       /* Should be continuous.  */
45       tp.opcode = htons (TFTP_ACK);
46