pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2025-12-28 16:29:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use verify instead of G_STATIC_ASSERT

Browse Source 
verify guarantee that the condition is always a compile
time constant.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
This commit is contained in:
Frediano Ziglio 2017-09-10 17:42:13 +01:00
parent 8e276278e5
commit ddf7b366b1
5 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/glib-compat.h
View File

@ -24,7 +24,7 @@
#if !GLIB_CHECK_VERSION(2,34,0)
#define g_clear_pointer(pp, destroy) \
G_STMT_START { \
G_STATIC_ASSERT (sizeof *(pp) == sizeof (gpointer)); \
SPICE_VERIFY (sizeof *(pp) == sizeof (gpointer)); \
/* Only one access, please */ \
gpointer *_pp = (gpointer *) (pp); \
gpointer _p; \

4
server/red-parse-qxl.c
View File

@ -35,7 +35,7 @@
*/
#define MAX_DATA_CHUNK 0x7ffffffflu
G_STATIC_ASSERT(MAX_DATA_CHUNK <= G_MAXINT32);
verify(MAX_DATA_CHUNK <= G_MAXINT32);
/* Limit number of chunks.
* The guest can attempt to make host allocate too much memory
@ -350,7 +350,7 @@ static SpiceClipRects *red_get_clip_rects(RedMemSlotInfo *slots, int group_id,
* by red_get_data_chunks_ptr checks.
*/
spice_assert((uint64_t) num_rects * sizeof(QXLRect) == size);
G_STATIC_ASSERT(sizeof(SpiceRect) == sizeof(QXLRect));
SPICE_VERIFY(sizeof(SpiceRect) == sizeof(QXLRect));
red = g_malloc(sizeof(*red) + num_rects * sizeof(SpiceRect));
red->num_rects = num_rects;

4
server/spice-bitmap-utils.h
View File

@ -36,7 +36,7 @@ typedef struct {
uint8_t pad;
} rgb32_pixel_t;
G_STATIC_ASSERT(sizeof(rgb32_pixel_t) == 4);
verify(sizeof(rgb32_pixel_t) == 4);
typedef struct {
uint8_t b;
@ -44,7 +44,7 @@ typedef struct {
uint8_t r;
} rgb24_pixel_t;
G_STATIC_ASSERT(sizeof(rgb24_pixel_t) == 3);
verify(sizeof(rgb24_pixel_t) == 3);
typedef uint16_t rgb16_pixel_t;

22
server/tests/replay.c
View File

@ -356,17 +356,17 @@ int main(int argc, char **argv)
"\t1=off 2=all 3=filter";
/* these asserts are here to check that the documentation we state above is still correct */
G_STATIC_ASSERT(SPICE_STREAM_VIDEO_OFF == 1);
G_STATIC_ASSERT(SPICE_STREAM_VIDEO_ALL == 2);
G_STATIC_ASSERT(SPICE_STREAM_VIDEO_FILTER == 3);
G_STATIC_ASSERT(SPICE_IMAGE_COMPRESSION_INVALID == 0);
G_STATIC_ASSERT(SPICE_IMAGE_COMPRESSION_OFF == 1);
G_STATIC_ASSERT(SPICE_IMAGE_COMPRESSION_AUTO_GLZ == 2);
G_STATIC_ASSERT(SPICE_IMAGE_COMPRESSION_AUTO_LZ == 3);
G_STATIC_ASSERT(SPICE_IMAGE_COMPRESSION_QUIC == 4);
G_STATIC_ASSERT(SPICE_IMAGE_COMPRESSION_GLZ == 5);
G_STATIC_ASSERT(SPICE_IMAGE_COMPRESSION_LZ == 6);
G_STATIC_ASSERT(SPICE_IMAGE_COMPRESSION_LZ4 == 7);
SPICE_VERIFY(SPICE_STREAM_VIDEO_OFF == 1);
SPICE_VERIFY(SPICE_STREAM_VIDEO_ALL == 2);
SPICE_VERIFY(SPICE_STREAM_VIDEO_FILTER == 3);
SPICE_VERIFY(SPICE_IMAGE_COMPRESSION_INVALID == 0);
SPICE_VERIFY(SPICE_IMAGE_COMPRESSION_OFF == 1);
SPICE_VERIFY(SPICE_IMAGE_COMPRESSION_AUTO_GLZ == 2);
SPICE_VERIFY(SPICE_IMAGE_COMPRESSION_AUTO_LZ == 3);
SPICE_VERIFY(SPICE_IMAGE_COMPRESSION_QUIC == 4);
SPICE_VERIFY(SPICE_IMAGE_COMPRESSION_GLZ == 5);
SPICE_VERIFY(SPICE_IMAGE_COMPRESSION_LZ == 6);
SPICE_VERIFY(SPICE_IMAGE_COMPRESSION_LZ4 == 7);
context = g_option_context_new("- replay spice server recording");
g_option_context_add_main_entries(context, entries, NULL);

6
server/tests/stat-test.c
View File

@ -34,6 +34,8 @@
#include <unistd.h>
#include <glib.h>
#include <common/macros.h>
#include "../stat.h"
#ifndef TEST_NAME
@ -49,8 +51,8 @@ void TEST_NAME(void)
stat_start_time_t start_time;
#if !defined(COMPRESS_STAT) && !defined(RED_WORKER_STAT)
G_STATIC_ASSERT(sizeof(start_time) == 0);
G_STATIC_ASSERT(sizeof(info) == 0);
SPICE_VERIFY(sizeof(start_time) == 0);
SPICE_VERIFY(sizeof(info) == 0);
#endif
stat_init(&info, "test", CLOCK_MONOTONIC);