[Spice-devel] [spice-server 07/10] qxl: Rename 'qxl' to 'qxl_cmd' in red_get_message

[Christophe Fergeau]

This is in preparation for next commit.
---
 server/red-parse-qxl.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/server/red-parse-qxl.c b/server/red-parse-qxl.c
index eb80ba81b..5408cfa5a 100644
--- a/server/red-parse-qxl.c
+++ b/server/red-parse-qxl.c
@@ -1283,7 +1283,7 @@ void red_put_update_cmd(RedUpdateCmd *red)
 bool red_get_message(RedMemSlotInfo *slots, int group_id,
                      RedMessage *red, QXLPHYSICAL addr)
 {
-    QXLMessage *qxl;
+    QXLMessage *qxl_msg;
     int error;
     int memslot_id;
     unsigned long len;
@@ -1295,21 +1295,21 @@ bool red_get_message(RedMemSlotInfo *slots, int group_id,
      *   luckily this is for debug logging only,
      *   so we can just ignore it by default.
      */
-    qxl = (QXLMessage *)memslot_get_virt(slots, addr, sizeof(*qxl), group_id, &error);
+    qxl_msg = (QXLMessage *)memslot_get_virt(slots, addr, sizeof(*qxl_msg), group_id, &error);
     if (error) {
         return false;
     }
-    red->release_info_ext.info      = &qxl->release_info;
+    red->release_info_ext.info      = &qxl_msg->release_info;
     red->release_info_ext.group_id  = group_id;
-    red->data                       = qxl->data;
-    memslot_id = memslot_get_id(slots, addr+sizeof(*qxl));
-    len = memslot_max_size_virt(slots, ((intptr_t) qxl)+sizeof(*qxl), memslot_id, group_id);
+    red->data                       = qxl_msg->data;
+    memslot_id = memslot_get_id(slots, addr+sizeof(*qxl_msg));
+    len = memslot_max_size_virt(slots, ((intptr_t) qxl_msg)+sizeof(*qxl_msg), memslot_id, group_id);
     len = MIN(len, 100000);
-    end = (uint8_t *)memchr(qxl->data, 0, len);
+    end = (uint8_t *)memchr(qxl_msg->data, 0, len);
     if (end == NULL) {
         return false;
     }
-    red->len = end - qxl->data;
+    red->len = end - qxl_msg->data;
     return true;
 }
 
-- 
2.14.3