From 81c04623ead52d9b9be949348fc498a9e1d9d89c Mon Sep 17 00:00:00 2001 From: Frediano Ziglio Date: Sat, 18 May 2019 20:20:20 +0100 Subject: [PATCH] Avoid to use reserved C++ keywords Signed-off-by: Frediano Ziglio --- server/gstreamer-encoder.c | 6 +++--- server/red-replay-qxl.c | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/server/gstreamer-encoder.c b/server/gstreamer-encoder.c index 1bab1df1..c40546e8 100644 --- a/server/gstreamer-encoder.c +++ b/server/gstreamer-encoder.c @@ -1011,10 +1011,10 @@ static gboolean create_pipeline(SpiceGstEncoder *encoder) } /* Figure out which parameter controls the GStreamer encoder's bitrate */ - GObjectClass *class = G_OBJECT_GET_CLASS(encoder->gstenc); - encoder->gstenc_bitrate_param = g_object_class_find_property(class, "bitrate"); + GObjectClass *klass = G_OBJECT_GET_CLASS(encoder->gstenc); + encoder->gstenc_bitrate_param = g_object_class_find_property(klass, "bitrate"); if (encoder->gstenc_bitrate_param == NULL) { - encoder->gstenc_bitrate_param = g_object_class_find_property(class, "target-bitrate"); + encoder->gstenc_bitrate_param = g_object_class_find_property(klass, "target-bitrate"); } if (encoder->gstenc_bitrate_param) { encoder->gstenc_bitrate_is_dynamic = (encoder->gstenc_bitrate_param->flags & GST_PARAM_MUTABLE_PLAYING); diff --git a/server/red-replay-qxl.c b/server/red-replay-qxl.c index 990e5485..026b6b21 100644 --- a/server/red-replay-qxl.c +++ b/server/red-replay-qxl.c @@ -219,14 +219,14 @@ static void hexdump(uint8_t *hex, uint8_t bytes) static replay_t read_binary(SpiceReplay *replay, const char *prefix, size_t *size, uint8_t **buf, size_t base_size) { - char template[1024]; + char pattern[1024]; int with_zlib = -1; unsigned int zlib_size; uint8_t *zlib_buffer; z_stream strm; - snprintf(template, sizeof(template), "binary %%d %s %%" PRIdPTR ":%%n", prefix); - replay_fscanf_check(replay, template, &with_zlib, size, &replay->end_pos); + snprintf(pattern, sizeof(pattern), "binary %%d %s %%" PRIdPTR ":%%n", prefix); + replay_fscanf_check(replay, pattern, &with_zlib, size, &replay->end_pos); if (replay->error) { return REPLAY_ERROR; } @@ -358,10 +358,10 @@ static void red_replay_point16_ptr(SpiceReplay *replay, QXLPoint16 *qxl) static void red_replay_rect_ptr(SpiceReplay *replay, const char *prefix, QXLRect *qxl) { - char template[1024]; + char pattern[1024]; - snprintf(template, sizeof(template), "rect %s %%d %%d %%d %%d\n%%n", prefix); - replay_fscanf_check(replay, template, &qxl->top, &qxl->left, &qxl->bottom, &qxl->right, + snprintf(pattern, sizeof(pattern), "rect %s %%d %%d %%d %%d\n%%n", prefix); + replay_fscanf_check(replay, pattern, &qxl->top, &qxl->left, &qxl->bottom, &qxl->right, &replay->end_pos); }