--- server/migration-protocol.h | 2 +- server/pixmap-cache.c | 16 ++++++++-------- server/pixmap-cache.h | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/server/migration-protocol.h b/server/migration-protocol.h index 3f08150..8458187 100644 --- a/server/migration-protocol.h +++ b/server/migration-protocol.h @@ -137,7 +137,7 @@ typedef struct __attribute__ ((__packed__)) SpiceMigrateDataDisplay { * For now, the cache is not migrated, and instead, we reset it and send * SPICE_MSG_DISPLAY_INVAL_ALL_PIXMAPS to the client. * In order to keep the client and server caches consistent: - * The channel which freezed the cache on the src side, unfreezes it + * The channel which froze the cache on the src side, unfreezes it * on the dest side, and increases its generation (see 'reset' in red_client_shared_cach.h). * In order to enforce that images that are added to the cache by other channels * will reach the client only after SPICE_MSG_DISPLAY_INVAL_ALL_PIXMAPS, diff --git a/server/pixmap-cache.c b/server/pixmap-cache.c index 3ca3b87..60847c3 100644 --- a/server/pixmap-cache.c +++ b/server/pixmap-cache.c @@ -40,10 +40,10 @@ void pixmap_cache_clear(PixmapCache *cache) { NewCacheItem *item; - if (cache->freezed) { - cache->lru.next = cache->freezed_head; - cache->lru.prev = cache->freezed_tail; - cache->freezed = FALSE; + if (cache->frozen) { + cache->lru.next = cache->frozen_head; + cache->lru.prev = cache->frozen_tail; + cache->frozen = FALSE; } verify(SPICE_OFFSETOF(NewCacheItem, lru_link) == 0); @@ -61,17 +61,17 @@ int pixmap_cache_freeze(PixmapCache *cache) { pthread_mutex_lock(&cache->lock); - if (cache->freezed) { + if (cache->frozen) { pthread_mutex_unlock(&cache->lock); return FALSE; } - cache->freezed_head = cache->lru.next; - cache->freezed_tail = cache->lru.prev; + cache->frozen_head = cache->lru.next; + cache->frozen_tail = cache->lru.prev; ring_init(&cache->lru); memset(cache->hash_table, 0, sizeof(*cache->hash_table) * BITS_CACHE_HASH_SIZE); cache->available = -1; - cache->freezed = TRUE; + cache->frozen = TRUE; pthread_mutex_unlock(&cache->lock); return TRUE; diff --git a/server/pixmap-cache.h b/server/pixmap-cache.h index 66658f3..dbcdcb4 100644 --- a/server/pixmap-cache.h +++ b/server/pixmap-cache.h @@ -50,9 +50,9 @@ struct PixmapCache { int64_t size; int32_t items; - int freezed; - RingItem *freezed_head; - RingItem *freezed_tail; + int frozen; + RingItem *frozen_head; + RingItem *frozen_tail; uint32_t generation; struct { -- 2.7.4 _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel