mirror of
https://github.com/morgan9e/FreeRDP
synced 2026-04-14 00:14:11 +09:00
[tidy] move loop variable declaration to loop
This commit is contained in:
@@ -36,7 +36,6 @@
|
||||
UINT android_cliprdr_send_client_format_list(CliprdrClientContext* cliprdr)
|
||||
{
|
||||
UINT rc = ERROR_INTERNAL_ERROR;
|
||||
UINT32 index;
|
||||
UINT32 formatId;
|
||||
UINT32 numFormats;
|
||||
UINT32* pFormatIds;
|
||||
@@ -59,7 +58,7 @@ UINT android_cliprdr_send_client_format_list(CliprdrClientContext* cliprdr)
|
||||
if (!formats)
|
||||
goto fail;
|
||||
|
||||
for (index = 0; index < numFormats; index++)
|
||||
for (UINT32 index = 0; index < numFormats; index++)
|
||||
{
|
||||
formatId = pFormatIds[index];
|
||||
formatName = ClipboardGetFormatName(afc->clipboard, formatId);
|
||||
@@ -169,7 +168,6 @@ static UINT android_cliprdr_monitor_ready(CliprdrClientContext* cliprdr,
|
||||
static UINT android_cliprdr_server_capabilities(CliprdrClientContext* cliprdr,
|
||||
const CLIPRDR_CAPABILITIES* capabilities)
|
||||
{
|
||||
UINT32 index;
|
||||
CLIPRDR_CAPABILITY_SET* capabilitySet;
|
||||
androidContext* afc;
|
||||
|
||||
@@ -181,7 +179,7 @@ static UINT android_cliprdr_server_capabilities(CliprdrClientContext* cliprdr,
|
||||
if (!afc)
|
||||
return ERROR_INVALID_PARAMETER;
|
||||
|
||||
for (index = 0; index < capabilities->cCapabilitiesSets; index++)
|
||||
for (UINT32 index = 0; index < capabilities->cCapabilitiesSets; index++)
|
||||
{
|
||||
capabilitySet = &(capabilities->capabilitySets[index]);
|
||||
|
||||
@@ -207,7 +205,6 @@ static UINT android_cliprdr_server_format_list(CliprdrClientContext* cliprdr,
|
||||
const CLIPRDR_FORMAT_LIST* formatList)
|
||||
{
|
||||
UINT rc;
|
||||
UINT32 index;
|
||||
CLIPRDR_FORMAT* format;
|
||||
androidContext* afc;
|
||||
|
||||
@@ -221,7 +218,7 @@ static UINT android_cliprdr_server_format_list(CliprdrClientContext* cliprdr,
|
||||
|
||||
if (afc->serverFormats)
|
||||
{
|
||||
for (index = 0; index < afc->numServerFormats; index++)
|
||||
for (UINT32 index = 0; index < afc->numServerFormats; index++)
|
||||
free(afc->serverFormats[index].formatName);
|
||||
|
||||
free(afc->serverFormats);
|
||||
@@ -238,7 +235,7 @@ static UINT android_cliprdr_server_format_list(CliprdrClientContext* cliprdr,
|
||||
if (!afc->serverFormats)
|
||||
return CHANNEL_RC_NO_MEMORY;
|
||||
|
||||
for (index = 0; index < afc->numServerFormats; index++)
|
||||
for (UINT32 index = 0; index < afc->numServerFormats; index++)
|
||||
{
|
||||
afc->serverFormats[index].formatId = formatList->formats[index].formatId;
|
||||
afc->serverFormats[index].formatName = NULL;
|
||||
@@ -252,7 +249,7 @@ static UINT android_cliprdr_server_format_list(CliprdrClientContext* cliprdr,
|
||||
}
|
||||
}
|
||||
|
||||
for (index = 0; index < afc->numServerFormats; index++)
|
||||
for (UINT32 index = 0; index < afc->numServerFormats; index++)
|
||||
{
|
||||
format = &(afc->serverFormats[index]);
|
||||
|
||||
@@ -374,7 +371,6 @@ android_cliprdr_server_format_data_response(CliprdrClientContext* cliprdr,
|
||||
{
|
||||
BYTE* data;
|
||||
UINT32 size;
|
||||
UINT32 index;
|
||||
UINT32 formatId;
|
||||
CLIPRDR_FORMAT* format = NULL;
|
||||
androidContext* afc;
|
||||
@@ -393,7 +389,7 @@ android_cliprdr_server_format_data_response(CliprdrClientContext* cliprdr,
|
||||
if (!instance)
|
||||
return ERROR_INVALID_PARAMETER;
|
||||
|
||||
for (index = 0; index < afc->numServerFormats; index++)
|
||||
for (UINT32 index = 0; index < afc->numServerFormats; index++)
|
||||
{
|
||||
if (afc->requestedFormatId == afc->serverFormats[index].formatId)
|
||||
format = &(afc->serverFormats[index]);
|
||||
|
||||
@@ -57,7 +57,6 @@ static ANDROID_EVENT* android_peek_event(ANDROID_EVENT_QUEUE* queue)
|
||||
|
||||
static ANDROID_EVENT* android_pop_event(ANDROID_EVENT_QUEUE* queue)
|
||||
{
|
||||
int i;
|
||||
ANDROID_EVENT* event;
|
||||
|
||||
if (queue->count < 1)
|
||||
@@ -66,7 +65,7 @@ static ANDROID_EVENT* android_pop_event(ANDROID_EVENT_QUEUE* queue)
|
||||
event = queue->events[0];
|
||||
(queue->count)--;
|
||||
|
||||
for (i = 0; i < queue->count; i++)
|
||||
for (size_t i = 0; i < queue->count; i++)
|
||||
{
|
||||
queue->events[i] = queue->events[i + 1];
|
||||
}
|
||||
|
||||
@@ -110,7 +110,6 @@ static BOOL android_begin_paint(rdpContext* context)
|
||||
|
||||
static BOOL android_end_paint(rdpContext* context)
|
||||
{
|
||||
int i;
|
||||
HGDI_WND hwnd;
|
||||
int ninvalid;
|
||||
rdpGdi* gdi;
|
||||
@@ -152,7 +151,7 @@ static BOOL android_end_paint(rdpContext* context)
|
||||
x2 = cinvalid[0].x + cinvalid[0].w;
|
||||
y2 = cinvalid[0].y + cinvalid[0].h;
|
||||
|
||||
for (i = 0; i < ninvalid; i++)
|
||||
for (int i = 0; i < ninvalid; i++)
|
||||
{
|
||||
x1 = MIN(x1, cinvalid[i].x);
|
||||
y1 = MIN(y1, cinvalid[i].y);
|
||||
@@ -698,7 +697,7 @@ Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1parse_1arguments(JNIEn
|
||||
jobjectArray arguments)
|
||||
{
|
||||
freerdp* inst = (freerdp*)instance;
|
||||
int i, count;
|
||||
int count;
|
||||
char** argv;
|
||||
DWORD status;
|
||||
|
||||
@@ -711,7 +710,7 @@ Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1parse_1arguments(JNIEn
|
||||
if (!argv)
|
||||
return JNI_TRUE;
|
||||
|
||||
for (i = 0; i < count; i++)
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
jstring str = (jstring)(*env)->GetObjectArrayElement(env, arguments, i);
|
||||
const char* raw = (*env)->GetStringUTFChars(env, str, 0);
|
||||
@@ -722,7 +721,7 @@ Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1parse_1arguments(JNIEn
|
||||
status =
|
||||
freerdp_client_settings_parse_command_line(inst->context->settings, count, argv, FALSE);
|
||||
|
||||
for (i = 0; i < count; i++)
|
||||
for (int i = 0; i < count; i++)
|
||||
free(argv[i]);
|
||||
|
||||
free(argv);
|
||||
|
||||
@@ -112,7 +112,6 @@ jstring jniNewStringUTF(JNIEnv* env, const char* in, int len)
|
||||
jstring out = NULL;
|
||||
jchar* unicode = NULL;
|
||||
jint result_size = 0;
|
||||
jint i;
|
||||
unsigned char* utf8 = (unsigned char*)in;
|
||||
|
||||
if (!in)
|
||||
@@ -128,7 +127,7 @@ jstring jniNewStringUTF(JNIEnv* env, const char* in, int len)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
for (i = 0; i < len; i++)
|
||||
for (jint i = 0; i < len; i++)
|
||||
{
|
||||
unsigned char one = utf8[i];
|
||||
switch (one >> 4)
|
||||
|
||||
Reference in New Issue
Block a user