Update data_store.c

Sync'd with mdhim-tng