- if (to == CH_UCS2 && destlen-o_len >= 2) {
- o_save[destlen-o_len] = 0;
- o_save[destlen-o_len+1] = 0;
- }
- else if ( to != CH_UCS2 && destlen-o_len > 0 )
- o_save[destlen-o_len] = 0;
- else {
- /* FIXME: what should we do here, string *might* be unterminated. E2BIG? */
- }
-
- return destlen-o_len;
+ return add_null( to, o_save, o_len, destlen -o_len);