int n;
if (!buf) {
- buf = (char *)malloc(CHUNK_SIZE);
+ buf = new_array(char, CHUNK_SIZE);
if (!buf) out_of_memory("simple_recv_token");
}
rprintf(FERROR, "compression init failed\n");
exit_cleanup(RERR_STREAMIO);
}
- if ((obuf = malloc(OBUF_SIZE)) == NULL)
+ if ((obuf = new_array(char, OBUF_SIZE)) == NULL)
out_of_memory("send_deflated_token");
init_done = 1;
} else
write_int(f, run_start);
if (write_batch) {
temp_byte = (char)(n==0? TOKEN_LONG: TOKENRUN_LONG);
- write_batch_delta_file(&temp_byte,sizeof(temp_byte));
+ write_batch_delta_file(&temp_byte,sizeof(char));
write_batch_delta_file((char *)&run_start,sizeof(run_start));
}
}
write_byte(f, n);
write_byte(f, n >> 8);
if (write_batch) {
- write_batch_delta_file((char *)&n,sizeof(char));
- temp_byte = (char) n >> 8;
- write_batch_delta_file(&temp_byte,sizeof(temp_byte));
+ temp_byte = (char)n;
+ write_batch_delta_file(&temp_byte,sizeof(char));
+ temp_byte = (char)(n >> 8);
+ write_batch_delta_file(&temp_byte,sizeof(char));
}
}
last_run_end = last_token;
write_byte(f, END_FLAG);
if (write_batch) {
temp_byte = END_FLAG;
- write_batch_delta_file((char *)&temp_byte,sizeof(temp_byte));
+ write_batch_delta_file(&temp_byte,sizeof(char));
}
} else if (token != -2) {
rprintf(FERROR, "inflate init failed\n");
exit_cleanup(RERR_STREAMIO);
}
- if ((cbuf = malloc(MAX_DATA_COUNT)) == NULL
- || (dbuf = malloc(AVAIL_OUT_SIZE(CHUNK_SIZE))) == NULL)
+ if (!(cbuf = new_array(char, MAX_DATA_COUNT))
+ || !(dbuf = new_array(char, AVAIL_OUT_SIZE(CHUNK_SIZE))))
out_of_memory("recv_deflated_token");
init_done = 1;
} else {