jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

no logic change, remove tabs

Browse Source
This commit is contained in:
Jay Sorg 2012-07-24 19:33:54 -07:00
parent fdc6aaad8b
commit 87ab0218e2
5 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xrdp/xrdp.c
View File

@ -87,7 +87,7 @@ g_xrdp_sync(long (*sync_func)(long param1, long param2), long sync_param1,
tc_mutex_unlock(g_sync_mutex); tc_mutex_unlock(g_sync_mutex);
} }
while (sync_command != 0); /* loop until g_process_waiting_function() while (sync_command != 0); /* loop until g_process_waiting_function()
* has processed the request*/ * has processed the request */
tc_mutex_unlock(g_sync1_mutex); tc_mutex_unlock(g_sync1_mutex);
/*g_writeln("g_xrdp_sync processed BY main thread -> continue");*/ /*g_writeln("g_xrdp_sync processed BY main thread -> continue");*/
} }

32
xrdp/xrdp_bitmap.c
View File

@ -352,8 +352,8 @@ xrdp_bitmap_load(struct xrdp_bitmap* self, const char* filename, int* palette)
if (!g_file_exist(filename)) if (!g_file_exist(filename))
{ {
log_message(LOG_LEVEL_ERROR, log_message(LOG_LEVEL_ERROR, "xrdp_bitmap_load: error bitmap file [%s] "
"xrdp_bitmap_load: error bitmap file [%s] does not exist",filename); "does not exist", filename);
return 1; return 1;
} }
s = (struct stream *)NULL; s = (struct stream *)NULL;
@ -363,15 +363,15 @@ xrdp_bitmap_load(struct xrdp_bitmap* self, const char* filename, int* palette)
/* read file type */ /* read file type */
if (g_file_read(fd, type1, 2) != 2) if (g_file_read(fd, type1, 2) != 2)
{ {
log_message(LOG_LEVEL_ERROR, log_message(LOG_LEVEL_ERROR, "xrdp_bitmap_load: error bitmap file [%s] "
"xrdp_bitmap_load: error bitmap file [%s] read error",filename); "read error", filename);
g_file_close(fd); g_file_close(fd);
return 1; return 1;
} }
if ((type1[0] != 'B') || (type1[1] != 'M')) if ((type1[0] != 'B') || (type1[1] != 'M'))
{ {
log_message(LOG_LEVEL_ERROR, log_message(LOG_LEVEL_ERROR, "xrdp_bitmap_load: error bitmap file [%s] "
"xrdp_bitmap_load: error bitmap file [%s] not BMP file", filename); "not BMP file", filename);
g_file_close(fd); g_file_close(fd);
return 1; return 1;
} }
@ -398,8 +398,8 @@ xrdp_bitmap_load(struct xrdp_bitmap* self, const char* filename, int* palette)
if ((header.bit_count != 4) && (header.bit_count != 8) && if ((header.bit_count != 4) && (header.bit_count != 8) &&
(header.bit_count != 24)) (header.bit_count != 24))
{ {
log_message(LOG_LEVEL_ERROR, log_message(LOG_LEVEL_ERROR, "xrdp_bitmap_load: error bitmap file [%s] "
"xrdp_bitmap_load: error bitmap file [%s] bad bpp %d",filename, header.bit_count); "bad bpp %d", filename, header.bit_count);
free_stream(s); free_stream(s);
g_file_close(fd); g_file_close(fd);
return 1; return 1;
@ -417,8 +417,8 @@ xrdp_bitmap_load(struct xrdp_bitmap* self, const char* filename, int* palette)
k = g_file_read(fd, s->data + i * size, size); k = g_file_read(fd, s->data + i * size, size);
if (k != size) if (k != size)
{ {
log_message(LOG_LEVEL_ERROR, log_message(LOG_LEVEL_ERROR, "xrdp_bitmap_load: error bitmap "
"xrdp_bitmap_load: error bitmap file [%s] read",filename); "file [%s] read", filename);
} }
} }
for (i = 0; i < self->height; i++) for (i = 0; i < self->height; i++)
@ -471,8 +471,8 @@ xrdp_bitmap_load(struct xrdp_bitmap* self, const char* filename, int* palette)
k = g_file_read(fd, s->data + i * size, size); k = g_file_read(fd, s->data + i * size, size);
if (k != size) if (k != size)
{ {
log_message(LOG_LEVEL_ERROR, log_message(LOG_LEVEL_ERROR, "xrdp_bitmap_load: error bitmap "
"xrdp_bitmap_load: error bitmap file [%s] read", filename); "file [%s] read", filename);
} }
} }
for (i = 0; i < self->height; i++) for (i = 0; i < self->height; i++)
@ -521,8 +521,8 @@ xrdp_bitmap_load(struct xrdp_bitmap* self, const char* filename, int* palette)
k = g_file_read(fd, s->data + i * size, size); k = g_file_read(fd, s->data + i * size, size);
if (k != size) if (k != size)
{ {
log_message(LOG_LEVEL_ERROR, log_message(LOG_LEVEL_ERROR, "xrdp_bitmap_load: error bitmap "
"xrdp_bitmap_load: error bitmap file [%s] read",filename); "file [%s] read", filename);
} }
} }
for (i = 0; i < self->height; i++) for (i = 0; i < self->height; i++)
@ -564,8 +564,8 @@ xrdp_bitmap_load(struct xrdp_bitmap* self, const char* filename, int* palette)
} }
else else
{ {
log_message(LOG_LEVEL_ERROR, log_message(LOG_LEVEL_ERROR, "xrdp_bitmap_load: error loading bitmap "
"xrdp_bitmap_load: error loading bitmap from file [%s]", filename); "from file [%s]", filename);
return 1; return 1;
} }
return 0; return 0;