From 8a9c1129a21582b29d96644be75d05d0efa57862 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 7 Feb 2019 12:22:51 +0100 Subject: [PATCH] spa: make fd in spa_data an int64_t So that we can store other things in it later as well. --- spa/include/spa/buffer/buffer.h | 2 +- spa/include/spa/debug/buffer.h | 2 +- src/pipewire/stream.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spa/include/spa/buffer/buffer.h b/spa/include/spa/buffer/buffer.h index dc1bc7b0c..462b93bb4 100644 --- a/spa/include/spa/buffer/buffer.h +++ b/spa/include/spa/buffer/buffer.h @@ -64,7 +64,7 @@ struct spa_data { #define SPA_DATA_FLAG_NONE 0 #define SPA_DATA_FLAG_CORRUPTED (1<<0) /**< data is corrupted in some way */ uint32_t flags; /**< data flags */ - int fd; /**< optional fd for data */ + int64_t fd; /**< optional fd for data */ uint32_t mapoffset; /**< offset to map fd at */ uint32_t maxsize; /**< max size of data */ void *data; /**< optional data pointer */ diff --git a/spa/include/spa/debug/buffer.h b/spa/include/spa/debug/buffer.h index a75e32088..69dcbc8a8 100644 --- a/spa/include/spa/debug/buffer.h +++ b/spa/include/spa/debug/buffer.h @@ -100,7 +100,7 @@ static inline int spa_debug_buffer(int indent, const struct spa_buffer *buffer) spa_debug_type_find_name(spa_type_data_type, d->type)); spa_debug("%*s" " flags: %d", indent, "", d->flags); spa_debug("%*s" " data: %p", indent, "", d->data); - spa_debug("%*s" " fd: %d", indent, "", d->fd); + spa_debug("%*s" " fd: %" PRIi64, indent, "", d->fd); spa_debug("%*s" " offset: %d", indent, "", d->mapoffset); spa_debug("%*s" " maxsize: %u", indent, "", d->maxsize); spa_debug("%*s" " chunk: %p", indent, "", d->chunk); diff --git a/src/pipewire/stream.c b/src/pipewire/stream.c index 10d5260f0..4f0b23078 100644 --- a/src/pipewire/stream.c +++ b/src/pipewire/stream.c @@ -528,7 +528,7 @@ static int map_data(struct stream *impl, struct spa_data *data, int prot) return -errno; } data->data = SPA_MEMBER(ptr, range.start, void); - pw_log_debug("stream %p: fd %d mapped %d %d %p", impl, data->fd, + pw_log_debug("stream %p: fd %"PRIi64" mapped %d %d %p", impl, data->fd, range.offset, range.size, data->data); return 0; @@ -543,7 +543,7 @@ static int unmap_data(struct stream *impl, struct spa_data *data) if (munmap(SPA_MEMBER(data->data, -range.start, void), range.size) < 0) pw_log_warn("failed to unmap: %m"); - pw_log_debug("stream %p: fd %d unmapped", impl, data->fd); + pw_log_debug("stream %p: fd %"PRIi64" unmapped", impl, data->fd); return 0; }