r10589: more struct-pointer