kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Indent fixes

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@800 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Peter Åstrand 2004-11-23 13:29:12 +00:00
parent 12623c1e10
commit 881f0fe93e
4 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
serial.c
View File

@ -700,11 +700,13 @@ serial_device_control(NTHANDLE handle, uint32 request, STREAM in, STREAM out)
case SERIAL_SET_BAUD_RATE: case SERIAL_SET_BAUD_RATE:
in_uint32_le(in, pser_inf->baud_rate); in_uint32_le(in, pser_inf->baud_rate);
set_termios(pser_inf, handle); set_termios(pser_inf, handle);
DEBUG_SERIAL(("serial_ioctl -> SERIAL_SET_BAUD_RATE %d\n", pser_inf->baud_rate)); DEBUG_SERIAL(("serial_ioctl -> SERIAL_SET_BAUD_RATE %d\n",
pser_inf->baud_rate));
break; break;
case SERIAL_GET_BAUD_RATE: case SERIAL_GET_BAUD_RATE:
out_uint32_le(out, pser_inf->baud_rate); out_uint32_le(out, pser_inf->baud_rate);
DEBUG_SERIAL(("serial_ioctl -> SERIAL_GET_BAUD_RATE %d\n", pser_inf->baud_rate)); DEBUG_SERIAL(("serial_ioctl -> SERIAL_GET_BAUD_RATE %d\n",
pser_inf->baud_rate));
break; break;
case SERIAL_SET_QUEUE_SIZE: case SERIAL_SET_QUEUE_SIZE:
in_uint32_le(in, pser_inf->queue_in_size); in_uint32_le(in, pser_inf->queue_in_size);
@ -717,8 +719,7 @@ serial_device_control(NTHANDLE handle, uint32 request, STREAM in, STREAM out)
in_uint8(in, pser_inf->parity); in_uint8(in, pser_inf->parity);
in_uint8(in, pser_inf->word_length); in_uint8(in, pser_inf->word_length);
set_termios(pser_inf, handle); set_termios(pser_inf, handle);
DEBUG_SERIAL(("serial_ioctl -> SERIAL_SET_LINE_CONTROL stop %d parity %d word %d\n", DEBUG_SERIAL(("serial_ioctl -> SERIAL_SET_LINE_CONTROL stop %d parity %d word %d\n", pser_inf->stop_bits, pser_inf->parity, pser_inf->word_length));
pser_inf->stop_bits, pser_inf->parity, pser_inf->word_length));
break; break;
case SERIAL_GET_LINE_CONTROL: case SERIAL_GET_LINE_CONTROL:
DEBUG_SERIAL(("serial_ioctl -> SERIAL_GET_LINE_CONTROL\n")); DEBUG_SERIAL(("serial_ioctl -> SERIAL_GET_LINE_CONTROL\n"));
@ -789,12 +790,13 @@ serial_device_control(NTHANDLE handle, uint32 request, STREAM in, STREAM out)
out_uint32(out, pser_inf->write_total_timeout_constant); out_uint32(out, pser_inf->write_total_timeout_constant);
break; break;
case SERIAL_GET_WAIT_MASK: case SERIAL_GET_WAIT_MASK:
DEBUG_SERIAL(("serial_ioctl -> SERIAL_GET_WAIT_MASK %X\n", pser_inf->wait_mask); DEBUG_SERIAL(("serial_ioctl -> SERIAL_GET_WAIT_MASK %X\n",
out_uint32(out, pser_inf->wait_mask)); pser_inf->wait_mask); out_uint32(out, pser_inf->wait_mask));
break; break;
case SERIAL_SET_WAIT_MASK: case SERIAL_SET_WAIT_MASK:
in_uint32(in, pser_inf->wait_mask); in_uint32(in, pser_inf->wait_mask);
DEBUG_SERIAL(("serial_ioctl -> SERIAL_SET_WAIT_MASK %X\n", pser_inf->wait_mask)); DEBUG_SERIAL(("serial_ioctl -> SERIAL_SET_WAIT_MASK %X\n",
pser_inf->wait_mask));
break; break;
case SERIAL_SET_DTR: case SERIAL_SET_DTR:
DEBUG_SERIAL(("serial_ioctl -> SERIAL_SET_DTR\n")); DEBUG_SERIAL(("serial_ioctl -> SERIAL_SET_DTR\n"));
@ -852,7 +854,8 @@ serial_device_control(NTHANDLE handle, uint32 request, STREAM in, STREAM out)
ioctl(handle, TIOCINQ, &result); ioctl(handle, TIOCINQ, &result);
out_uint32_le(out, result); /* Amount in in queue */ out_uint32_le(out, result); /* Amount in in queue */
if (result) if (result)
DEBUG_SERIAL(("serial_ioctl -> SERIAL_GET_COMMSTATUS in queue %d\n", result)); DEBUG_SERIAL(("serial_ioctl -> SERIAL_GET_COMMSTATUS in queue %d\n",
result));
result = 0; result = 0;
ioctl(handle, TIOCOUTQ, &result); ioctl(handle, TIOCOUTQ, &result);
@ -879,7 +882,8 @@ serial_device_control(NTHANDLE handle, uint32 request, STREAM in, STREAM out)
rdpdr_abort_io(handle, 3, STATUS_CANCELLED); rdpdr_abort_io(handle, 3, STATUS_CANCELLED);
break; break;
case SERIAL_WAIT_ON_MASK: case SERIAL_WAIT_ON_MASK:
DEBUG_SERIAL(("serial_ioctl -> SERIAL_WAIT_ON_MASK %X\n", pser_inf->wait_mask)); DEBUG_SERIAL(("serial_ioctl -> SERIAL_WAIT_ON_MASK %X\n",
pser_inf->wait_mask));
pser_inf->event_pending = 1; pser_inf->event_pending = 1;
if (serial_get_event(handle, &result)) if (serial_get_event(handle, &result))
{ {
@ -985,7 +989,8 @@ serial_get_event(NTHANDLE handle, uint32 * result)
pser_inf->event_dsr = bytes & TIOCM_DSR; pser_inf->event_dsr = bytes & TIOCM_DSR;
if (pser_inf->wait_mask & SERIAL_EV_DSR) if (pser_inf->wait_mask & SERIAL_EV_DSR)
{ {
DEBUG_SERIAL(("event -> SERIAL_EV_DSR %s\n", (bytes & TIOCM_DSR) ? "ON" : "OFF")); DEBUG_SERIAL(("event -> SERIAL_EV_DSR %s\n",
(bytes & TIOCM_DSR) ? "ON" : "OFF"));
*result |= SERIAL_EV_DSR; *result |= SERIAL_EV_DSR;
ret = True; ret = True;
} }
@ -996,7 +1001,8 @@ serial_get_event(NTHANDLE handle, uint32 * result)
pser_inf->event_cts = bytes & TIOCM_CTS; pser_inf->event_cts = bytes & TIOCM_CTS;
if (pser_inf->wait_mask & SERIAL_EV_CTS) if (pser_inf->wait_mask & SERIAL_EV_CTS)
{ {
DEBUG_SERIAL((" EVENT-> SERIAL_EV_CTS %s\n", (bytes & TIOCM_CTS) ? "ON" : "OFF")); DEBUG_SERIAL((" EVENT-> SERIAL_EV_CTS %s\n",
(bytes & TIOCM_CTS) ? "ON" : "OFF"));
*result |= SERIAL_EV_CTS; *result |= SERIAL_EV_CTS;
ret = True; ret = True;
} }

8
xwin.c
View File

@ -966,10 +966,10 @@ ui_create_window(void)
attribs.override_redirect = g_fullscreen; attribs.override_redirect = g_fullscreen;
attribs.colormap = g_xcolmap; attribs.colormap = g_xcolmap;
g_wnd = XCreateWindow(g_display, RootWindowOfScreen(g_screen), g_xpos, g_ypos, wndwidth, wndheight, g_wnd = XCreateWindow(g_display, RootWindowOfScreen(g_screen), g_xpos, g_ypos, wndwidth,
0, g_depth, InputOutput, g_visual, wndheight, 0, g_depth, InputOutput, g_visual,
CWBackPixel | CWBackingStore | CWOverrideRedirect | CWBackPixel | CWBackingStore | CWOverrideRedirect | CWColormap |
CWColormap | CWBorderPixel, &attribs); CWBorderPixel, &attribs);
if (g_gc == NULL) if (g_gc == NULL)
g_gc = XCreateGC(g_display, g_wnd, 0, NULL); g_gc = XCreateGC(g_display, g_wnd, 0, NULL);