summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libxrdp/xrdp_channel.c2
-rw-r--r--libxrdp/xrdp_mcs.c6
-rw-r--r--libxrdp/xrdp_rdp.c8
3 files changed, 11 insertions, 5 deletions
diff --git a/libxrdp/xrdp_channel.c b/libxrdp/xrdp_channel.c
index 4085f650..092cefa4 100644
--- a/libxrdp/xrdp_channel.c
+++ b/libxrdp/xrdp_channel.c
@@ -66,7 +66,7 @@ xrdp_channel_delete(struct xrdp_channel* self)
{
return;
}
- memset(self,0,sizeof(struct xrdp_channel));
+ g_memset(self,0,sizeof(struct xrdp_channel));
g_free(self);
}
diff --git a/libxrdp/xrdp_mcs.c b/libxrdp/xrdp_mcs.c
index 57494191..1a7a0411 100644
--- a/libxrdp/xrdp_mcs.c
+++ b/libxrdp/xrdp_mcs.c
@@ -141,14 +141,16 @@ xrdp_mcs_recv(struct xrdp_mcs* self, struct stream* s, int* chan)
DEBUG(("xrdp_mcs_recv adding channel %4.4x", chanid));
if(xrdp_mcs_send_cjcf(self, userid, chanid)!=0)
{
- g_writeln("Non handled error from xrdp_mcs_send_cjcf") ;
+ g_writeln("Non handled error from xrdp_mcs_send_cjcf") ;
}
continue;
}
if(appid==MCS_SDRQ || appid==MCS_SDIN)
{
break ;
- }else{
+ }
+ else
+ {
g_writeln("Recieved an unhandled appid:%d",appid);
}
break;
diff --git a/libxrdp/xrdp_rdp.c b/libxrdp/xrdp_rdp.c
index 54f8a24f..497b9c7d 100644
--- a/libxrdp/xrdp_rdp.c
+++ b/libxrdp/xrdp_rdp.c
@@ -251,7 +251,9 @@ xrdp_rdp_recv(struct xrdp_rdp* self, struct stream* s, int* code)
{
g_writeln("xrdp_channel_process returned unhandled error") ;
}
- }else{
+ }
+ else
+ {
g_writeln("Wrong channel Id to be handled by xrdp_channel_process %d",chan);
}
s->next_packet = 0;
@@ -274,7 +276,9 @@ xrdp_rdp_recv(struct xrdp_rdp* self, struct stream* s, int* code)
len = (int)(s->end - s->p);
g_writeln("xrdp_rdp_recv: bad RDP packet, length [%d]", len);
return 0;
- }else{
+ }
+ else
+ {
in_uint16_le(s, len);
/*g_writeln("New len received : %d next packet: %d s_end: %d",len,s->next_packet,s->end); */
in_uint16_le(s, pdu_code);