summaryrefslogtreecommitdiffstats
path: root/libxrdp
diff options
context:
space:
mode:
authorJay Sorg <jay.sorg@gmail.com>2016-03-14 17:04:08 -0700
committerJay Sorg <jay.sorg@gmail.com>2016-03-14 17:04:08 -0700
commit38241f2a0bd8909815cce67adb56d29619b19ad1 (patch)
tree0492997b6ec068f5d5abef4a113855a021d231df /libxrdp
parent73935792058af2664ebb59108ba6b3fed8e8fcc0 (diff)
downloadxrdp-proprietary-38241f2a0bd8909815cce67adb56d29619b19ad1.tar.gz
xrdp-proprietary-38241f2a0bd8909815cce67adb56d29619b19ad1.zip
Fix all format warnings and some unused variable warnings
Diffstat (limited to 'libxrdp')
-rw-r--r--libxrdp/libxrdp.c5
-rw-r--r--libxrdp/xrdp_caps.c3
-rw-r--r--libxrdp/xrdp_sec.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/libxrdp/libxrdp.c b/libxrdp/libxrdp.c
index a823bfdf..0015f26b 100644
--- a/libxrdp/libxrdp.c
+++ b/libxrdp/libxrdp.c
@@ -253,8 +253,8 @@ libxrdp_process_data(struct xrdp_session *session, struct stream *s)
{
/*This situation can happen and this is a workaround*/
cont = 0;
- g_writeln("Serious programming error we were locked in a deadly loop") ;
- g_writeln("remaining :%d", s->end - s->next_packet);
+ g_writeln("Serious programming error: we were locked in a deadly loop");
+ g_writeln("Remaining: %d", (int) (s->end - s->next_packet));
s->next_packet = 0;
}
@@ -1298,7 +1298,6 @@ libxrdp_fastpath_send_surface(struct xrdp_session *session,
struct stream ls;
struct stream *s;
struct xrdp_rdp *rdp;
- int rv;
int sec_bytes;
int rdp_bytes;
int max_bytes;
diff --git a/libxrdp/xrdp_caps.c b/libxrdp/xrdp_caps.c
index 6d109f76..300704c6 100644
--- a/libxrdp/xrdp_caps.c
+++ b/libxrdp/xrdp_caps.c
@@ -562,7 +562,8 @@ xrdp_caps_process_confirm_active(struct xrdp_rdp *self, struct stream *s)
in_uint16_le(s, len);
if ((len < 4) || !s_check_rem(s, len - 4))
{
- g_writeln("xrdp_caps_process_confirm_active: error len %d", len, s->end - s->p);
+ g_writeln("xrdp_caps_process_confirm_active: error: len %d, "
+ "remaining %d", len, (int) (s->end - s->p));
return 1;
}
len -= 4;
diff --git a/libxrdp/xrdp_sec.c b/libxrdp/xrdp_sec.c
index 06dfdda7..4076699e 100644
--- a/libxrdp/xrdp_sec.c
+++ b/libxrdp/xrdp_sec.c
@@ -419,7 +419,7 @@ xrdp_load_keyboard_layout(struct xrdp_client_info *client_info)
}
else
{
- LLOGLN(0, ("xrdp_load_keyboard_layout: error opening %d",
+ LLOGLN(0, ("xrdp_load_keyboard_layout: error opening %s",
keyboard_cfg_file));
}
}