aft.c: Fix com_add().

[paraslash.git] / osl.c

diff --git a/osl.c b/osl.c
index 487d0721f02069e5c0a51bd8a018038ed136b7a9..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;


@@ -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;
                }


@@ -963,7 +963,7 @@ int get_mapped_object(const struct osl_table *t, unsigned 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;
 }


@@ -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 %zu 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)