What is the difference between a city and a city state?

A state is a part of a nation with its own government but goes by laws of the big nation as well. It usually consists of a bunch of cities and empty space.

A city-state is like what Ancient Rome and Greece had; really big cities more like mini-states that could decide to go to war with each other; cities can't do that. It is in between both.