aft.c: Fix com_add().

[paraslash.git] / osl.c

diff --git a/osl.c b/osl.c
index 1fc45bd4367506943a99e9789679ee1d93409ca6..54461c1dd46026ae509bae25b56bfe291238bca0 100644 (file)
--- a/osl.c
+++ b/osl.c
@@ -88,7 +88,7 @@ ssize_t para_write_all(int fd, const void *buf, size_t size)
        const char *b = buf;
        while (size) {
                ssize_t ret = para_write(fd, b, size);
        const char *b = buf;
        while (size) {
                ssize_t ret = para_write(fd, b, size);

-               PARA_DEBUG_LOG("ret: %d\n", ret);
+               PARA_DEBUG_LOG("ret: %zd\n", ret);

                if (ret < 0)
                        return ret;
                b += ret;
                if (ret < 0)
                        return ret;
                b += ret;


@@ -170,7 +170,7 @@ static int append_file(const char *filename, char *header, size_t header_size,
 {
        int ret, fd;
 
 {
        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;
        ret = para_open(filename, O_WRONLY | O_CREAT | O_APPEND, 0644);
        if (ret < 0)
                return ret;


@@ -493,10 +493,10 @@ int init_table_structure(const struct osl_table_description *desc,
        struct osl_table *t = para_calloc(sizeof(*t));
        int i, ret = -E_BAD_TABLE_DESC, have_disk_storage_name_column = 0;
 
        struct osl_table *t = para_calloc(sizeof(*t));
        int i, ret = -E_BAD_TABLE_DESC, have_disk_storage_name_column = 0;
 

-       PARA_INFO_LOG("creating table structure for '%s' from table "
-               "description\n", desc->name);

        if (!desc)
                goto err;
        if (!desc)
                goto err;

+       PARA_INFO_LOG("creating table structure for '%s' from table "
+               "description\n", desc->name);

        ret = -E_NO_COLUMN_DESC;
        if (!desc->column_descriptions)
                goto err;
        ret = -E_NO_COLUMN_DESC;
        if (!desc->column_descriptions)
                goto err;


@@ -609,7 +609,7 @@ int read_table_desc(struct osl_object *map, struct osl_table_description *desc)
 
                ret = -E_SHORT_TABLE;
                if (map->size < offset + MIN_IDX_COLUMN_DESCRIPTION_SIZE) {
 
                ret = -E_SHORT_TABLE;
                if (map->size < offset + MIN_IDX_COLUMN_DESCRIPTION_SIZE) {

-                       PARA_ERROR_LOG("map size = %u < %u = offset + min desc size\n",
+                       PARA_ERROR_LOG("map size = %zu < %u = offset + min desc size\n",

                                map->size, offset + MIN_IDX_COLUMN_DESCRIPTION_SIZE);
                        goto err;
                }
                                map->size, offset + MIN_IDX_COLUMN_DESCRIPTION_SIZE);
                        goto err;
                }


@@ -945,7 +945,7 @@ int get_mapped_object(const struct osl_table *t, unsigned col_num,
        struct osl_column *col = &t->columns[col_num];
        uint32_t offset;
        char *header;
        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)
        int ret;
 
        if (t->num_rows <= row_num)


@@ -959,11 +959,11 @@ int get_mapped_object(const struct osl_table *t, unsigned col_num,
        header = col->data_map.data + offset;
        obj->data = header + 1;
        if (read_u8(header) == 0xff) {
        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;
        }
                        obj->size, offset);
                return -E_INVALID_OBJECT;
        }

-       PARA_DEBUG_LOG("mapped obj row_num: %u, col %u, size: %d\n", row_num,
+       PARA_DEBUG_LOG("mapped obj row_num: %u, col %u, size: %zu\n", row_num,

                col_num, obj->size);
        return 1;
 }
                col_num, obj->size);
        return 1;
 }


@@ -1190,13 +1190,13 @@ int osl_close_table(struct osl_table *t, enum osl_close_flags flags)
  */
 int row_is_invalid(struct osl_table *t, uint32_t row_num)
 {
  */
 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++) {
        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);
                        return 0;
        }
        PARA_INFO_LOG("row %d is invalid\n", row_num);


@@ -1216,7 +1216,7 @@ int row_is_invalid(struct osl_table *t, uint32_t row_num)
  */
 int mark_row_invalid(struct osl_table *t, uint32_t 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 i, ret = get_index_entry_start(t, row_num, &index_entry);
 
        PARA_INFO_LOG("marking row %d as invalid\n", row_num);


@@ -1359,7 +1359,7 @@ static int append_map_file(const struct osl_table *t, unsigned col_num,
        int ret;
        char header = 0; /* zero means valid object */
 
        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);
        ret = append_file(filename, &header, 1, obj->data, obj->size,
                new_size);
        free(filename);


@@ -1374,7 +1374,7 @@ static int append_index_entry(const struct osl_table *t, char *new_index_entry)
        if (!t->num_mapped_columns)
                return 1;
        filename = index_filename(t->desc);
        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 %u bytes\n", t->index_entry_size);

        ret = append_file(filename, NULL, 0, new_index_entry,
                t->index_entry_size, NULL);
        free(filename);
        ret = append_file(filename, NULL, 0, new_index_entry,
                t->index_entry_size, NULL);
        free(filename);


@@ -1507,7 +1507,7 @@ int osl_add_and_get_row(struct osl_table *t, struct osl_object *objects,
                                goto out;
                }
                if (sf & OSL_FIXED_SIZE) {
                                goto out;
                }
                if (sf & OSL_FIXED_SIZE) {

-                       PARA_DEBUG_LOG("fixed size. need: %d, have: %d\n",
+                       PARA_DEBUG_LOG("fixed size. need: %zu, have: %d\n",

                                objects[i].size, cd->data_size);
                        ret = -E_BAD_DATA_SIZE;
                        if (objects[i].size != cd->data_size)
                                objects[i].size, cd->data_size);
                        ret = -E_BAD_DATA_SIZE;
                        if (objects[i].size != cd->data_size)


@@ -1529,7 +1529,7 @@ int osl_add_and_get_row(struct osl_table *t, struct osl_object *objects,
                if (st == OSL_MAPPED_STORAGE) {
                        uint32_t new_size;
                        struct osl_column *col = &t->columns[i];
                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)
                                objects[i].size);
                        ret = append_map_file(t, i, objects + i, &new_size);
                        if (ret < 0)


@@ -1965,7 +1965,7 @@ int osl_update_object(struct osl_table *t, const struct osl_row *r,
                        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;
                        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;
                        ret = get_index_entry_start(t, r->id, &index_entry);
                        if (ret < 0)
                                return ret;