[PATCH] flow: Reduce scope of type_or_state in flow_log__()