r21041: Change some "private" to "private_data", and change one (void **) function