From bffa28a7de37b449fa586ca7b97a12ec46d7e045 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Tue, 16 Jul 2013 18:59:26 -0700
Subject: [PATCH] Remove usage of xfree().

---
 src/protocols/rdp/client.c                     | 6 +++---
 src/protocols/rdp/guac_rdpdr/rdpdr_service.c   | 2 +-
 src/protocols/rdp/guac_rdpsnd/rdpsnd_service.c | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/protocols/rdp/client.c b/src/protocols/rdp/client.c
index d37ea8d4..bced8a4d 100644
--- a/src/protocols/rdp/client.c
+++ b/src/protocols/rdp/client.c
@@ -216,7 +216,7 @@ boolean rdp_freerdp_pre_connect(freerdp* instance) {
     bitmap->Decompress = guac_rdp_bitmap_decompress;
     bitmap->SetSurface = guac_rdp_bitmap_setsurface;
     graphics_register_bitmap(context->graphics, bitmap);
-    xfree(bitmap);
+    free(bitmap);
 
     /* Set up glyph handling */
     glyph = xnew(rdpGlyph);
@@ -227,7 +227,7 @@ boolean rdp_freerdp_pre_connect(freerdp* instance) {
     glyph->BeginDraw = guac_rdp_glyph_begindraw;
     glyph->EndDraw = guac_rdp_glyph_enddraw;
     graphics_register_glyph(context->graphics, glyph);
-    xfree(glyph);
+    free(glyph);
 
     /* Set up pointer handling */
     pointer = xnew(rdpPointer);
@@ -242,7 +242,7 @@ boolean rdp_freerdp_pre_connect(freerdp* instance) {
     pointer->SetDefault = guac_rdp_pointer_set_default;
 #endif
     graphics_register_pointer(context->graphics, pointer);
-    xfree(pointer);
+    free(pointer);
 
     /* Set up GDI */
     instance->update->EndPaint = guac_rdp_gdi_end_paint;
diff --git a/src/protocols/rdp/guac_rdpdr/rdpdr_service.c b/src/protocols/rdp/guac_rdpdr/rdpdr_service.c
index 61eb0f86..6ae2648d 100644
--- a/src/protocols/rdp/guac_rdpdr/rdpdr_service.c
+++ b/src/protocols/rdp/guac_rdpdr/rdpdr_service.c
@@ -77,7 +77,7 @@ void guac_rdpdr_process_connect(rdpSvcPlugin* plugin) {
 }
 
 void guac_rdpdr_process_terminate(rdpSvcPlugin* plugin) {
-    xfree(plugin);
+    free(plugin);
 }
 
 void guac_rdpdr_process_event(rdpSvcPlugin* plugin, RDP_EVENT* event) {
diff --git a/src/protocols/rdp/guac_rdpsnd/rdpsnd_service.c b/src/protocols/rdp/guac_rdpsnd/rdpsnd_service.c
index b26c16b8..d049b46a 100644
--- a/src/protocols/rdp/guac_rdpsnd/rdpsnd_service.c
+++ b/src/protocols/rdp/guac_rdpsnd/rdpsnd_service.c
@@ -75,7 +75,7 @@ void guac_rdpsnd_process_connect(rdpSvcPlugin* plugin) {
 }
 
 void guac_rdpsnd_process_terminate(rdpSvcPlugin* plugin) {
-    xfree(plugin);
+    free(plugin);
 }
 
 void guac_rdpsnd_process_event(rdpSvcPlugin* plugin, RDP_EVENT* event) {