Kaffarah for breaking an oath

I'm trying to remember if an oath I made in the past contained multiple parts or just one part. What I remember is that I said to Allah, "I promise or wallahi, I will not do this sin again" (I did commit the sin recently, and I made the kafara already).

However, I think I may have said in the same oath: Protect me Allah, and wallahi I will not do this sin again (1) not not do a different sin (2) and not do the other sin (3))

If all 3 sins may have been mentioned in the same oath, would I have to make 3 different kaffaras ? Or just making the one kaffarah for all 3 is enough?

I made the intetion at the time for the kaffarah to cover the one thing in my mind and whatever else I may have forgot... I dont remember if I made the oath including the 3 sins or not, but I do remmber making an oath about the one sin specifically. I made these oaths when I was making tawbah to Allah when I was in a very emotional state.