From 121c17e8181b65fb73005cb907a89775b0cf6060 Mon Sep 17 00:00:00 2001
From: Alexandre Quesnel <131881+aquesnel@users.noreply.github.com>
Date: Sat, 12 Dec 2020 17:05:09 +0000
Subject: [PATCH] Removing duplicate logging statements

---
 libxrdp/xrdp_caps.c | 4 ++--
 libxrdp/xrdp_rdp.c  | 4 +---
 libxrdp/xrdp_sec.c  | 2 --
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/libxrdp/xrdp_caps.c b/libxrdp/xrdp_caps.c
index 42d0789c..1994966e 100644
--- a/libxrdp/xrdp_caps.c
+++ b/libxrdp/xrdp_caps.c
@@ -525,8 +525,8 @@ xrdp_caps_process_codecs(struct xrdp_rdp *self, struct stream *s, int len)
             /* make sure that requested quality is  between 0 to 100 */
             if (self->client_info.jpeg_prop[0] < 0 || self->client_info.jpeg_prop[0] > 100)
             {
-                LOG_DEVEL(LOG_LEVEL_WARNING, "  Warning: the requested jpeg quality (%d) is invalid,"
-                          " falling back to default", self->client_info.jpeg_prop[0]);
+                LOG(LOG_LEVEL_WARNING, "  Warning: the requested jpeg quality (%d) is invalid, "
+                    "falling back to default", self->client_info.jpeg_prop[0]);
                 self->client_info.jpeg_prop[0] = 75; /* use default */
             }
             LOG(LOG_LEVEL_INFO, "  jpeg quality set to %d", self->client_info.jpeg_prop[0]);
diff --git a/libxrdp/xrdp_rdp.c b/libxrdp/xrdp_rdp.c
index 33b82a61..99286433 100644
--- a/libxrdp/xrdp_rdp.c
+++ b/libxrdp/xrdp_rdp.c
@@ -460,7 +460,6 @@ xrdp_rdp_recv(struct xrdp_rdp *self, struct stream *s, int *code)
         if (error != 0)
         {
             LOG(LOG_LEVEL_ERROR, "out xrdp_rdp_recv error");
-            LOG(LOG_LEVEL_ERROR, "xrdp_rdp_recv: xrdp_sec_recv failed");
             return 1;
         }
 
@@ -499,9 +498,8 @@ xrdp_rdp_recv(struct xrdp_rdp *self, struct stream *s, int *code)
     {
         s->next_packet = 0;
         *code = 0;
-        LOG_DEVEL(LOG_LEVEL_TRACE, "out (3) xrdp_rdp_recv");
         len = (int)(s->end - s->p);
-        LOG_DEVEL(LOG_LEVEL_TRACE, "xrdp_rdp_recv: bad RDP packet, length [%d]", len);
+        LOG_DEVEL(LOG_LEVEL_TRACE, "out (3) xrdp_rdp_recv: bad RDP packet, length [%d]", len);
         return 0;
     }
     else
diff --git a/libxrdp/xrdp_sec.c b/libxrdp/xrdp_sec.c
index e195878f..529d12e4 100644
--- a/libxrdp/xrdp_sec.c
+++ b/libxrdp/xrdp_sec.c
@@ -685,7 +685,6 @@ xrdp_sec_process_logon_info(struct xrdp_sec *self, struct stream *s)
     if ((flags & RDP_LOGON_NORMAL) != RDP_LOGON_NORMAL) /* 0x33 */
     {
         /* must be or error */
-        LOG(LOG_LEVEL_ERROR, "xrdp_sec_process_logon_info: flags wrong, major error");
         LOG(LOG_LEVEL_ERROR, "xrdp_sec_process_logon_info: flags wrong, likely decrypt "
             "not working");
         return 1;
@@ -1253,7 +1252,6 @@ xrdp_sec_recv(struct xrdp_sec *self, struct stream *s, int *chan)
     if (xrdp_mcs_recv(self->mcs_layer, s, chan) != 0)
     {
         LOG(LOG_LEVEL_ERROR, " out xrdp_sec_recv : error");
-        LOG(LOG_LEVEL_ERROR, "xrdp_sec_recv: xrdp_mcs_recv failed");
         return 1;
     }