- if (memcmp(remember_cyl, master->cylinder, sizeof(cylinder_t) * MAX_CYLINDERS) &&
- cylinder_none(dive->cylinder))
- memcpy(dive->cylinder, master->cylinder, sizeof(cylinder_t) * MAX_CYLINDERS);
- if (memcmp(remember_ws, master->weightsystem, sizeof(weightsystem_t) * MAX_WEIGHTSYSTEMS) &&
- weightsystem_none(dive->weightsystem))
- memcpy(dive->weightsystem, master->weightsystem, sizeof(weightsystem_t) * MAX_WEIGHTSYSTEMS);
+ if ( ! cylinders_equal(remember_cyl, master->cylinder) &&
+ (no_cylinders(dive->cylinder) ||
+ cylinders_equal(dive->cylinder, remember_cyl)))
+ memcpy(dive->cylinder, master->cylinder, CYL_BYTES);
+ if (! weightsystems_equal(remember_ws, master->weightsystem) &&
+ (no_weightsystems(dive->weightsystem) ||
+ weightsystems_equal(dive->weightsystem, remember_ws)))
+ memcpy(dive->weightsystem, master->weightsystem, WS_BYTES);