There are some goto's to the middle of if's and else's in tftp.c. Such jumps could perhaps be changed to a place less susceptible to confusion... Since it's a new piece of code it might still be open to small revisions. It may cost some extra if's but it won't make a difference in performance.