I-94 Issue (is is unlawful presence???) issue for I485?

[TELL_ME]

I was working for company A and had valid visa stamp in my passport until June,2000. While working for company A, company B transferred my H1 and after the approval notice with an integral I-94 that was valid until the Dec 2002 came, i traveled with old company to Mexico for 5 days. When i returned, i was still working for company A (old company) and the immigration officer issued me a new I-94 card until the visa date which was June,2000. Then in two months i joined the new employer and went to the then INS office to get my I-94 revalidated. The INS officer was not very friendly and he removed my I-94 white card from passport and told me to keep the I-94 card that came with the transfer. He did not put any stamp on the passport.
I have applied for extension of my H1B and have received those without any issues referencing the I-94 card that i surrendered while leaving for Mexico.

I am confused now if this would be a unlawful presence?

Any thoughts?