Fix some signedness warnings.

diff --git a/aft.c b/aft.c
index aaeab8a39f22abd9e2855eb1d354939c46431111..c2c3274607abfb89631b76c407d7d4c02efb905c 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -724,7 +724,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
                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);
@@ -1265,7 +1265,7 @@ static int com_add_callback(const struct osl_object *query,
        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;

diff --git a/osl.c b/osl.c
index 1fc45bd4367506943a99e9789679ee1d93409ca6..487d0721f02069e5c0a51bd8a018038ed136b7a9 100644 (file)
--- a/osl.c
+++ b/osl.c
@@ -170,7 +170,7 @@ static int append_file(const char *filename, char *header, size_t header_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;
@@ -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;
-       unsigned char *index_entry;
+       char *index_entry;
        int ret;
 
        if (t->num_rows <= row_num)
@@ -959,7 +959,7 @@ 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) {
-               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;
        }
@@ -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)
 {
-       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);
@@ -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)
 {
-       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);
@@ -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 */
 
-       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);
@@ -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);
-       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);
@@ -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];
-                       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)
@@ -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;
-                       unsigned char *index_entry;
+                       char *index_entry;
                        ret = get_index_entry_start(t, r->id, &index_entry);
                        if (ret < 0)
                                return ret;

diff --git a/osl.h b/osl.h
index 50570ee1b679d3e2183a5a8bf74bfc6b3cbda2f3..d787564f36b7e60f41fec0b1f0b8e0e38406accc 100644 (file)
--- a/osl.h
+++ b/osl.h
@@ -12,7 +12,7 @@ struct osl_object {
        /** Pointer to the data of the object. */
        void *data;
        /** The object's size. */
-       off_t size;
+       size_t size;
 };
 
 /** Flags that change the internal handling of osl tables. */

diff --git a/osl_core.h b/osl_core.h
index 27b808a7dfbf415efec209c86e09128569b94000..295351fecf72a8474c200dd8ded8305a07d4308e 100644 (file)
--- a/osl_core.h
+++ b/osl_core.h
@@ -250,7 +250,7 @@ _static_inline_ char *column_filename(const struct osl_table *t, unsigned col_nu
  * \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;
@@ -258,7 +258,7 @@ _static_inline_ int get_index_entry_start(const struct osl_table *t, uint32_t ro
                *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;
 }
 
@@ -275,7 +275,7 @@ _static_inline_ int get_index_entry_start(const struct osl_table *t, uint32_t ro
  * \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)