Fix some format string warnings on x86_64.

diff --git a/afs.c b/afs.c
index c726f35f6a3524fa56a8934ae660d62472c8bf45..3fc5df4302edc8df4e41e04728389e26b31a2d05 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -674,7 +674,7 @@ static void command_post_select(struct sched *s, struct task *t)
                goto out;
        }
        if (t->ret != sizeof(buf)) {
-               PARA_NOTICE_LOG("short read (%d bytes, expected %d)\n",
+               PARA_NOTICE_LOG("short read (%d bytes, expected %lu)\n",
                        t->ret, sizeof(buf));
                t->ret = 1;
                goto out;

diff --git a/aft.c b/aft.c
index e682c203adb8678f0ae4db31060f6cbb3ddbe327..866f269f0081219f012e60374cb466c7e64fcd1e 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -1194,7 +1194,7 @@ static void save_audio_file_info(HASH_TYPE *hash, const char *path,
 
        pos = AFTROW_PATH_OFFSET + path_len;
        PARA_DEBUG_LOG("size: %zu, afhi starts at %d\n", size, pos);
-       PARA_DEBUG_LOG("last afhi byte: %p, pos %d\n", buf + pos + afhi_size - 1,
+       PARA_DEBUG_LOG("last afhi byte: %p, pos %zu\n", buf + pos + afhi_size - 1,
                pos + afhi_size - 1);
        write_u16(buf + AFTROW_AFHI_OFFSET_POS, pos);
        save_afhi(afhi, buf + pos);

diff --git a/attribute.c b/attribute.c
index 86fc36d7615f2f7f702126015eb8176540fcce37..cecd1aa5b5b104d6c473c457f87185c6da506a7a 100644 (file)
--- a/attribute.c
+++ b/attribute.c
@@ -174,7 +174,8 @@ static int com_setatt_callback(const struct osl_object *query,
        }
        if (!add_mask && !del_mask)
                return -E_ATTR_SYNTAX;
-       PARA_DEBUG_LOG("masks: %llx:%llx\n", add_mask, del_mask);
+       PARA_DEBUG_LOG("masks: %llx:%llx\n",(long long unsigned)add_mask,
+               (long long unsigned)del_mask);
        for (; p < (char *)query->data + query->size; p += len + 1) { /* TODO: fnmatch */
                struct afs_info old_afsi, new_afsi;
                struct osl_row *aft_row;

diff --git a/mood.c b/mood.c
index decc77fc74f407b901ac13b59e18afe32da308e5..d29b930a0be1e0e8c64024579ac3342102eaf941 100644 (file)
--- a/mood.c
+++ b/mood.c
@@ -858,10 +858,12 @@ static void log_statistics(void)
                PARA_NOTICE_LOG("no admissible files\n");
                return;
        }
-       PARA_NOTICE_LOG("last_played mean: %lli, last_played sigma: %lli\n",
-               statistics.last_played_sum / n, int_sqrt(statistics.last_played_qd / n));
-       PARA_NOTICE_LOG("num_played mean: %lli, num_played sigma: %lli\n",
-               statistics.num_played_sum / n, int_sqrt(statistics.num_played_qd / n));
+       PARA_NOTICE_LOG("last_played mean: %lli, last_played sigma: %llu\n",
+               (long long int)(statistics.last_played_sum / n),
+               (long long unsigned)int_sqrt(statistics.last_played_qd / n));
+       PARA_NOTICE_LOG("num_played mean: %lli, num_played sigma: %llu\n",
+               (long long int)statistics.num_played_sum / n,
+               (long long unsigned)int_sqrt(statistics.num_played_qd / n));
 }
 
 /**

diff --git a/osl.c b/osl.c
index 487d0721f02069e5c0a51bd8a018038ed136b7a9..0ac7ead0ffda5ed0925106de589b0bba5c41e706 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);
-               PARA_DEBUG_LOG("ret: %d\n", ret);
+               PARA_DEBUG_LOG("ret: %zd\n", ret);
                if (ret < 0)
                        return ret;
                b += ret;
@@ -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) {
-                       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;
                }
@@ -963,7 +963,7 @@ int get_mapped_object(const struct osl_table *t, unsigned col_num,
                        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;
 }
@@ -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 %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);
@@ -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) {
-                       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)