The two terms are used synonomously all the time; however, there is a subtle but important distinction. In my undergraduate courses I define warfare as having a military outcome, and war as having a political outcome. Warfare is how you wage battle - hence the military outcome. This is why you can win the battle and still lose the war.