return 1;
}
if (opts->mode == LS_MODE_VERBOSE) {
- HASH_TYPE asc_hash[2 * HASH_SIZE + 1];
+ char asc_hash[2 * HASH_SIZE + 1];
char *att_line, *lyrics_line, *image_line;
hash_to_asc(d->hash, asc_hash);
char afsi_buf[AFSI_SIZE];
uint32_t flags = read_u32(buf + AFTROW_FLAGS_OFFSET);
- hash = buf + AFTROW_HASH_OFFSET;
+ hash = (HASH_TYPE *)buf + AFTROW_HASH_OFFSET;
hash_to_asc(hash, asc);;
objs[AFTCOL_HASH].data = buf + AFTROW_HASH_OFFSET;
objs[AFTCOL_HASH].size = HASH_SIZE;
{
int ret, fd;
- PARA_DEBUG_LOG("appending %lu + %ld bytes\n", header_size, data_size);
+ PARA_DEBUG_LOG("appending %zu + %zu bytes\n", header_size, data_size);
ret = para_open(filename, O_WRONLY | O_CREAT | O_APPEND, 0644);
if (ret < 0)
return ret;
struct osl_column *col = &t->columns[col_num];
uint32_t offset;
char *header;
- unsigned char *index_entry;
+ char *index_entry;
int ret;
if (t->num_rows <= row_num)
header = col->data_map.data + offset;
obj->data = header + 1;
if (read_u8(header) == 0xff) {
- PARA_ERROR_LOG("col %d, size %ld, offset %ld\n", col_num,
+ PARA_ERROR_LOG("col %u, size %zu, offset %u\n", col_num,
obj->size, offset);
return -E_INVALID_OBJECT;
}
*/
int row_is_invalid(struct osl_table *t, uint32_t row_num)
{
- unsigned char *index_entry;
+ char *index_entry;
int i, ret = get_index_entry_start(t, row_num, &index_entry);
if (ret < 0)
return ret;
for (i = 0; i < t->index_entry_size; i++) {
- if (index_entry[i] != 0xff)
+ if ((unsigned char)index_entry[i] != 0xff)
return 0;
}
PARA_INFO_LOG("row %d is invalid\n", row_num);
*/
int mark_row_invalid(struct osl_table *t, uint32_t row_num)
{
- unsigned char *index_entry;
+ char *index_entry;
int i, ret = get_index_entry_start(t, row_num, &index_entry);
PARA_INFO_LOG("marking row %d as invalid\n", row_num);
int ret;
char header = 0; /* zero means valid object */
- PARA_DEBUG_LOG("appending %ld + 1 byte\n", obj->size);
+ PARA_DEBUG_LOG("appending %zu + 1 byte\n", obj->size);
ret = append_file(filename, &header, 1, obj->data, obj->size,
new_size);
free(filename);
if (!t->num_mapped_columns)
return 1;
filename = index_filename(t->desc);
- PARA_DEBUG_LOG("appending %ld bytes\n", t->index_entry_size);
+ PARA_DEBUG_LOG("appending %zu bytes\n", t->index_entry_size);
ret = append_file(filename, NULL, 0, new_index_entry,
t->index_entry_size, NULL);
free(filename);
if (st == OSL_MAPPED_STORAGE) {
uint32_t new_size;
struct osl_column *col = &t->columns[i];
- PARA_DEBUG_LOG("appending object of size %ld\n",
+ PARA_DEBUG_LOG("appending object of size %zu\n",
objects[i].size);
ret = append_map_file(t, i, objects + i, &new_size);
if (ret < 0)
memcpy(old_obj.data, obj->data, cd->data_size);
else { /* TODO: if the size doesn't change, use old space */
uint32_t new_data_map_size;
- unsigned char *index_entry;
+ char *index_entry;
ret = get_index_entry_start(t, r->id, &index_entry);
if (ret < 0)
return ret;
* \sa get_index_entry().
*/
_static_inline_ int get_index_entry_start(const struct osl_table *t, uint32_t row_num,
- unsigned char **index_entry)
+ char **index_entry)
{
uint32_t index_offset;
index_offset = t->index_header_size + t->index_entry_size * row_num;
*index_entry = NULL;
return -E_INDEX_CORRUPTION;
}
- *index_entry = (unsigned char *)(t->index_map.data) + index_offset;
+ *index_entry = (char *)(t->index_map.data) + index_offset;
return 1;
}
* \sa get_index_entry_start().
*/
_static_inline_ int get_index_entry(const struct osl_table *t, uint32_t row_num,
- uint32_t col_num, unsigned char **index_entry)
+ uint32_t col_num, char **index_entry)
{
int ret = get_index_entry_start(t, row_num, index_entry);
if (ret < 0)