fixed some unreadVariable Cppcheck warnings

This commit is contained in:
firewave
2026-02-25 12:24:26 +01:00
parent 3db1c993bf
commit 214cf50df5
23 changed files with 57 additions and 83 deletions
+1 -1
View File
@@ -323,7 +323,7 @@ libxrdp_send_palette(struct xrdp_session *session, int *palette)
{
int rv;
int i = 0;
int color = 0;
int color;
struct stream *s = (struct stream *)NULL;
if (session->client_info->bpp > 8)
+2 -5
View File
@@ -729,17 +729,14 @@ xrdp_caps_process_frame_ack(struct xrdp_rdp *self, struct stream *s, int len)
static int
xrdp_caps_process_surface_cmds(struct xrdp_rdp *self, struct stream *s, int len)
{
#ifdef USE_DEVEL_LOGGING
int cmdFlags;
#ifndef USE_DEVEL_LOGGING
/* TODO: remove UNUSED_VAR once the `cmdFlags` variable is used for more than
logging in debug mode */
UNUSED_VAR(cmdFlags);
#endif
LOG_DEVEL(LOG_LEVEL_TRACE, "xrdp_caps_process_surface_cmds:");
in_uint32_le(s, cmdFlags);
in_uint8s(s, 4); /* reserved */
LOG_DEVEL(LOG_LEVEL_TRACE, " cmdFlags 0x%08x", cmdFlags);
#endif
return 0;
}
+7 -7
View File
@@ -843,13 +843,13 @@ xrdp_mcs_out_gcc_data(struct xrdp_sec *self)
int gcc_size;
char *gcc_size_ptr;
char *ud_ptr;
int header_length = 0;
int server_cert_len = 0;
int public_key_blob_len = 0;
int key_len = 0;
int bit_len = 0;
int data_len = 0;
int modulus_len = 0;
int header_length;
int server_cert_len;
int public_key_blob_len;
int key_len;
int bit_len;
int data_len;
int modulus_len;
num_channels = self->mcs_layer->channel_list->count;
num_channels_even = num_channels + (num_channels & 1);
+2 -4
View File
@@ -560,10 +560,10 @@ compress_rdp_5(struct xrdp_mppc_enc *enc, tui8 *srcData, int len)
tui32 data_end;
tui8 byte_val;
crc = 0;
lom = 0;
ctr = 0;
opb_index = 0;
bits_left = 8;
copy_offset = 0;
hash_table = enc->hash_table;
hbuf_start = enc->historyBuffer;
outputBuffer = enc->outputBuffer;
@@ -588,8 +588,6 @@ compress_rdp_5(struct xrdp_mppc_enc *enc, tui8 *srcData, int len)
/* point to start of data to be compressed */
historyPointer = &(enc->historyBuffer[historyOffset]);
ctr = copy_offset = lom = 0;
/* if we are at start of history buffer, do not attempt to compress */
/* first 2 bytes, because minimum LoM is 3 */
if (historyOffset == 0)
+6 -6
View File
@@ -450,7 +450,7 @@ xrdp_order_pack_small_or_tiny(struct xrdp_orders *self,
{
int move_up_count = 0;
int index = 0;
int size = 0;
int size;
int keep_looking = 1;
move_up_count = 0;
@@ -2237,9 +2237,9 @@ xrdp_orders_send_raw_bitmap(struct xrdp_orders *self,
int len = 0;
int bufsize = 0;
int Bpp = 0;
int i = 0;
int j = 0;
int pixel = 0;
int i;
int j;
int pixel;
int e = 0;
int max_order_size;
struct xrdp_client_info *ci;
@@ -2664,8 +2664,8 @@ xrdp_orders_send_raw_bitmap2(struct xrdp_orders *self,
int bufsize = 0;
int Bpp = 0;
int i = 0;
int j = 0;
int pixel = 0;
int j;
int pixel;
int e = 0;
int max_order_size;
struct xrdp_client_info *ci;
+3 -3
View File
@@ -48,7 +48,7 @@ xrdp_rdp_read_config(const char *xrdp_ini, struct xrdp_client_info *client_info)
char *value = NULL;
int pos;
char *tmp = NULL;
int tmp_length = 0;
int tmp_length;
client_info->xrdp_keyboard_overrides.type = -1;
client_info->xrdp_keyboard_overrides.subtype = -1;
@@ -461,10 +461,10 @@ xrdp_rdp_init_data(struct xrdp_rdp *self, struct stream *s)
int
xrdp_rdp_recv(struct xrdp_rdp *self, struct stream *s, int *code)
{
int error = 0;
int error;
int len = 0;
int pdu_code = 0;
int chan = 0;
int chan;
const tui8 *header;
+1 -1
View File
@@ -2237,7 +2237,7 @@ xrdp_sec_incoming(struct xrdp_sec *self)
struct list *items = NULL;
struct list *values = NULL;
struct xrdp_iso *iso;
int index = 0;
int index;
char *item = NULL;
char *value = NULL;
char key_file[256];