Hi Jay,
this looks really good and promising. I've nothing to add but this
single patch. It fixes a few 'Dead local storage' warnings, so nothing
critical. I'm pretty sure these fixes don't break anything but please
take a look at them.
Keep up the great work,
Christoph
Am Dienstag, den 22.12.2009, 15:29 -0800 schrieb Jay Sorg:
> This is pretty much what I want to release.
> I'm just going to update the readme / faq documents.
> Maybe add some keymaps.
>
> http://server1.xrdp.org/xrdp/xrdp-5.0.tar.gz
>
> Jay
>From 292b51abf1d674fd55119872e25e17952cbafe92 Mon Sep 17 00:00:00 2001
From: Christoph Brill <egore...@egore911.de>
Date: Fri, 25 Dec 2009 12:40:28 +0100
Subject: [PATCH] [Bugfix] Fix a bunch of warnings found by clang
This reduces the number of warnings reported by 'scan-build make -j5'.
There are still some false positives, but this patches only fixes the
ones I was pretty sure about.
---
libxrdp/libxrdp.c | 3 ---
libxrdp/xrdp_channel.c | 1 -
rdp/rdp_orders.c | 4 ++--
rdp/rdp_rdp.c | 3 ---
sesman/chansrv/clipboard.c | 1 -
sesman/libscp/libscp_v1s.c | 6 ------
sesman/scp_v0.c | 1 -
sesman/scp_v1_mng.c | 5 -----
sesman/session.c | 1 -
xrdp/xrdp_bitmap.c | 1 -
10 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/libxrdp/libxrdp.c b/libxrdp/libxrdp.c
index 79c3106..23689db 100644
--- a/libxrdp/libxrdp.c
+++ b/libxrdp/libxrdp.c
@@ -173,7 +173,6 @@ int EXPORT_CC
libxrdp_send_bitmap(struct xrdp_session* session, int width, int height,
int bpp, char* data, int x, int y, int cx, int cy)
{
- int data_size;
int line_size;
int i;
int j;
@@ -291,8 +290,6 @@ libxrdp_send_bitmap(struct xrdp_session* session, int width, int height,
}
else
{
- lines_sending = 0;
- data_size = width * height * Bpp;
total_lines = height;
i = 0;
p = data;
diff --git a/libxrdp/xrdp_channel.c b/libxrdp/xrdp_channel.c
index 4af3243..b06d58e 100644
--- a/libxrdp/xrdp_channel.c
+++ b/libxrdp/xrdp_channel.c
@@ -170,7 +170,6 @@ xrdp_channel_process(struct xrdp_channel* self, struct stream* s,
g_writeln("xrdp_channel_process, channel not found");
return 1;
}
- rv = 0;
in_uint32_le(s, length);
in_uint32_le(s, flags);
rv = xrdp_channel_call_callback(self, s, channel_id, length, flags);
diff --git a/rdp/rdp_orders.c b/rdp/rdp_orders.c
index 0dd0d7b..0af1df3 100644
--- a/rdp/rdp_orders.c
+++ b/rdp/rdp_orders.c
@@ -1044,8 +1044,8 @@ rdp_orders_process_desksave(struct rdp_orders* self, struct stream* s,
{
in_uint8(s, self->state.desksave_action);
}
- width = (self->state.desksave_right - self->state.desksave_left) + 1;
- height = (self->state.desksave_bottom - self->state.desksave_top) + 1;
+// width = (self->state.desksave_right - self->state.desksave_left) + 1;
+// height = (self->state.desksave_bottom - self->state.desksave_top) + 1;
if (self->state.desksave_action == 0)
{
// ui_desktop_save(os->offset, os->left, os->top, width, height);
diff --git a/rdp/rdp_rdp.c b/rdp/rdp_rdp.c
index 28d20c8..2d11761 100644
--- a/rdp/rdp_rdp.c
+++ b/rdp/rdp_rdp.c
@@ -869,7 +869,6 @@ rdp_rdp_process_data_pdu(struct rdp_rdp* self, struct stream* s)
{
int data_pdu_type;
int ctype;
- int clen;
int len;
int rv;
@@ -878,8 +877,6 @@ rdp_rdp_process_data_pdu(struct rdp_rdp* self, struct stream* s)
in_uint16_le(s, len);
in_uint8(s, data_pdu_type);
in_uint8(s, ctype);
- in_uint16_le(s, clen);
- clen -= 18;
switch (data_pdu_type)
{
case RDP_DATA_PDU_UPDATE:
diff --git a/sesman/chansrv/clipboard.c b/sesman/chansrv/clipboard.c
index b6ac73f..879c93e 100644
--- a/sesman/chansrv/clipboard.c
+++ b/sesman/chansrv/clipboard.c
@@ -580,7 +580,6 @@ clipboard_process_data_response(struct stream* s, int clip_msg_status,
}
g_data_in_size = len;
g_wcstombs(g_data_in, wtext, len + 1);
- len = g_strlen(g_data_in);
g_data_in_time = clipboard_get_local_time();
g_data_in_up_to_date = 1;
}
diff --git a/sesman/libscp/libscp_v1s.c b/sesman/libscp/libscp_v1s.c
index 23ee32e..8752e73 100644
--- a/sesman/libscp/libscp_v1s.c
+++ b/sesman/libscp/libscp_v1s.c
@@ -61,10 +61,6 @@ enum SCP_SERVER_STATES_E scp_v1s_accept(struct SCP_CONNECTION* c, struct SCP_SES
return SCP_SERVER_STATE_NETWORK_ERR;
}
}
- else
- {
- version = 1;
- }
in_uint32_be(c->in_s, size);
if (size < 12)
@@ -242,8 +238,6 @@ scp_v1s_request_password(struct SCP_CONNECTION* c, struct SCP_SESSION* s, char*
/* send password request */
version=1;
- size=12;
- cmdset=0;
cmd=3;
out_uint32_be(c->out_s, version); /* version */
diff --git a/sesman/scp_v0.c b/sesman/scp_v0.c
index af84f80..7848ca9 100644
--- a/sesman/scp_v0.c
+++ b/sesman/scp_v0.c
@@ -77,7 +77,6 @@ scp_v0_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
if (display == 0)
{
auth_end(data);
- data = 0;
scp_v0s_deny_connection(c);
}
else
diff --git a/sesman/scp_v1_mng.c b/sesman/scp_v1_mng.c
index 636fac9..a177322 100644
--- a/sesman/scp_v1_mng.c
+++ b/sesman/scp_v1_mng.c
@@ -38,16 +38,11 @@ void DEFAULT_CC
scp_v1_mng_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
{
long data;
- int retries;
- int current_try;
enum SCP_SERVER_STATES_E e;
struct SCP_DISCONNECTED_SESSION* slist = 0;
int scount;
int end = 0;
- retries = g_cfg->sec.login_retry;
- current_try = retries;
-
data = auth_userpass(s->username, s->password);
/*LOG_DBG("user: %s\npass: %s", s->username, s->password);*/
diff --git a/sesman/session.c b/sesman/session.c
index aee2af3..18f46dc 100644
--- a/sesman/session.c
+++ b/sesman/session.c
@@ -333,7 +333,6 @@ session_start_fork(int width, int height, int bpp, char* username,
g_free(temp);
return 0;
}
- wmpid = 0;
pid = g_fork();
if (pid == -1)
{
diff --git a/xrdp/xrdp_bitmap.c b/xrdp/xrdp_bitmap.c
index 0b82b3d..b60edea 100644
--- a/xrdp/xrdp_bitmap.c
+++ b/xrdp/xrdp_bitmap.c
@@ -761,7 +761,6 @@ xrdp_bitmap_copy_box_with_crc(struct xrdp_bitmap* self,
{
return 1;
}
- crc = dest->crc;
CRC_START(crc);
if (self->bpp == 24)
{
--
1.6.6.rc3
------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
_______________________________________________
xrdp-devel mailing list
xrdp-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xrdp-devel
