CVS: rdesktop rdesktop.c,1.116,1.117 rdpsnd_oss.c,1.15,1.16 serial.c,1.23,1.24 xwin.c,1.180,1.181

Peter Åstrand <[email protected]>
Newsgroups gmane.network.rdesktop.cvs
Message-ID <[email protected]> 
Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12499

Modified Files:
	rdesktop.c rdpsnd_oss.c serial.c xwin.c 
Log Message:
Indent fixes

Index: rdesktop.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdesktop.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** rdesktop.c	18 Nov 2004 11:18:49 -0000	1.116
--- rdesktop.c	23 Nov 2004 13:29:12 -0000	1.117
***************
*** 458,462 ****
  				if (*p == '+' || *p == '-')
  					g_xpos = strtol(p, &p, 10);
! 				
  				if (*p == '+' || *p == '-')
  					g_ypos = strtol(p, NULL, 10);
--- 458,462 ----
  				if (*p == '+' || *p == '-')
  					g_xpos = strtol(p, &p, 10);
! 
  				if (*p == '+' || *p == '-')
  					g_ypos = strtol(p, NULL, 10);

Index: rdpsnd_oss.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_oss.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** rdpsnd_oss.c	3 Nov 2004 10:05:02 -0000	1.15
--- rdpsnd_oss.c	23 Nov 2004 13:29:12 -0000	1.16
***************
*** 139,143 ****
  		audio_buf_info info;
  
! 		memset(&info,0,sizeof(info));
  		if (ioctl(g_dsp_fd, SNDCTL_DSP_GETOSPACE, &info) == -1)
  		{
--- 139,143 ----
  		audio_buf_info info;
  
! 		memset(&info, 0, sizeof(info));
  		if (ioctl(g_dsp_fd, SNDCTL_DSP_GETOSPACE, &info) == -1)
  		{
***************
*** 255,259 ****
  		if (!g_driver_broken)
  		{
! 			memset(&info,0,sizeof(info));
  			if (ioctl(g_dsp_fd, SNDCTL_DSP_GETOSPACE, &info) == -1)
  			{
--- 255,259 ----
  		if (!g_driver_broken)
  		{
! 			memset(&info, 0, sizeof(info));
  			if (ioctl(g_dsp_fd, SNDCTL_DSP_GETOSPACE, &info) == -1)
  			{

Index: serial.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/serial.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** serial.c	6 Nov 2004 17:27:45 -0000	1.23
--- serial.c	23 Nov 2004 13:29:12 -0000	1.24
***************
*** 701,709 ****
  			in_uint32_le(in, pser_inf->baud_rate);
  			set_termios(pser_inf, handle);
! 			DEBUG_SERIAL(("serial_ioctl -> SERIAL_SET_BAUD_RATE %d\n", pser_inf->baud_rate));
  			break;
  		case SERIAL_GET_BAUD_RATE:
  			out_uint32_le(out, pser_inf->baud_rate);
! 			DEBUG_SERIAL(("serial_ioctl -> SERIAL_GET_BAUD_RATE %d\n", pser_inf->baud_rate));
  			break;
  		case SERIAL_SET_QUEUE_SIZE:
--- 701,711 ----
  			in_uint32_le(in, pser_inf->baud_rate);
  			set_termios(pser_inf, handle);
! 			DEBUG_SERIAL(("serial_ioctl -> SERIAL_SET_BAUD_RATE %d\n",
! 				      pser_inf->baud_rate));
  			break;
  		case SERIAL_GET_BAUD_RATE:
  			out_uint32_le(out, pser_inf->baud_rate);
! 			DEBUG_SERIAL(("serial_ioctl -> SERIAL_GET_BAUD_RATE %d\n",
! 				      pser_inf->baud_rate));
  			break;
  		case SERIAL_SET_QUEUE_SIZE:
***************
*** 711,715 ****
  			in_uint32_le(in, pser_inf->queue_out_size);
  			DEBUG_SERIAL(("serial_ioctl -> SERIAL_SET_QUEUE_SIZE in %d out %d\n",
! 			    pser_inf->queue_in_size, pser_inf->queue_out_size));
  			break;
  		case SERIAL_SET_LINE_CONTROL:
--- 713,717 ----
  			in_uint32_le(in, pser_inf->queue_out_size);
  			DEBUG_SERIAL(("serial_ioctl -> SERIAL_SET_QUEUE_SIZE in %d out %d\n",
! 				      pser_inf->queue_in_size, pser_inf->queue_out_size));
  			break;
  		case SERIAL_SET_LINE_CONTROL:
***************
*** 718,723 ****
  			in_uint8(in, pser_inf->word_length);
  			set_termios(pser_inf, handle);
! 			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));
  			break;
  		case SERIAL_GET_LINE_CONTROL:
--- 720,724 ----
  			in_uint8(in, pser_inf->word_length);
  			set_termios(pser_inf, handle);
! 			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));
  			break;
  		case SERIAL_GET_LINE_CONTROL:
***************
*** 762,767 ****
  			in_uint32_le(in, pser_inf->offlimit);
  			DEBUG_SERIAL(("serial_ioctl -> SERIAL_SET_HANDFLOW %x %x %x %x\n",
! 			    pser_inf->control, pser_inf->xonoff, pser_inf->onlimit,
! 			    pser_inf->onlimit));
  			set_termios(pser_inf, handle);
  			break;
--- 763,768 ----
  			in_uint32_le(in, pser_inf->offlimit);
  			DEBUG_SERIAL(("serial_ioctl -> SERIAL_SET_HANDFLOW %x %x %x %x\n",
! 				      pser_inf->control, pser_inf->xonoff, pser_inf->onlimit,
! 				      pser_inf->onlimit));
  			set_termios(pser_inf, handle);
  			break;
***************
*** 773,785 ****
  			in_uint32(in, pser_inf->write_total_timeout_constant);
  			DEBUG_SERIAL(("serial_ioctl -> SERIAL_SET_TIMEOUTS read timeout %d %d %d\n",
! 			    pser_inf->read_interval_timeout,
! 			    pser_inf->read_total_timeout_multiplier,
! 			    pser_inf->read_total_timeout_constant));
  			break;
  		case SERIAL_GET_TIMEOUTS:
  			DEBUG_SERIAL(("serial_ioctl -> SERIAL_GET_TIMEOUTS read timeout %d %d %d\n",
! 			    pser_inf->read_interval_timeout,
! 			    pser_inf->read_total_timeout_multiplier,
! 			    pser_inf->read_total_timeout_constant));
  
  			out_uint32(out, pser_inf->read_interval_timeout);
--- 774,786 ----
  			in_uint32(in, pser_inf->write_total_timeout_constant);
  			DEBUG_SERIAL(("serial_ioctl -> SERIAL_SET_TIMEOUTS read timeout %d %d %d\n",
! 				      pser_inf->read_interval_timeout,
! 				      pser_inf->read_total_timeout_multiplier,
! 				      pser_inf->read_total_timeout_constant));
  			break;
  		case SERIAL_GET_TIMEOUTS:
  			DEBUG_SERIAL(("serial_ioctl -> SERIAL_GET_TIMEOUTS read timeout %d %d %d\n",
! 				      pser_inf->read_interval_timeout,
! 				      pser_inf->read_total_timeout_multiplier,
! 				      pser_inf->read_total_timeout_constant));
  
  			out_uint32(out, pser_inf->read_interval_timeout);
***************
*** 790,799 ****
  			break;
  		case SERIAL_GET_WAIT_MASK:
! 			DEBUG_SERIAL(("serial_ioctl -> SERIAL_GET_WAIT_MASK %X\n", pser_inf->wait_mask);
! 			out_uint32(out, pser_inf->wait_mask));
  			break;
  		case SERIAL_SET_WAIT_MASK:
  			in_uint32(in, pser_inf->wait_mask);
! 			DEBUG_SERIAL(("serial_ioctl -> SERIAL_SET_WAIT_MASK %X\n", pser_inf->wait_mask));
  			break;
  		case SERIAL_SET_DTR:
--- 791,801 ----
  			break;
  		case SERIAL_GET_WAIT_MASK:
! 			DEBUG_SERIAL(("serial_ioctl -> SERIAL_GET_WAIT_MASK %X\n",
! 				      pser_inf->wait_mask); out_uint32(out, pser_inf->wait_mask));
  			break;
  		case SERIAL_SET_WAIT_MASK:
  			in_uint32(in, pser_inf->wait_mask);
! 			DEBUG_SERIAL(("serial_ioctl -> SERIAL_SET_WAIT_MASK %X\n",
! 				      pser_inf->wait_mask));
  			break;
  		case SERIAL_SET_DTR:
***************
*** 853,857 ****
  			out_uint32_le(out, result);	/* Amount in in queue */
  			if (result)
! 				DEBUG_SERIAL(("serial_ioctl -> SERIAL_GET_COMMSTATUS in queue %d\n", result));
  
  			result = 0;
--- 855,860 ----
  			out_uint32_le(out, result);	/* Amount in in queue */
  			if (result)
! 				DEBUG_SERIAL(("serial_ioctl -> SERIAL_GET_COMMSTATUS in queue %d\n",
! 					      result));
  
  			result = 0;
***************
*** 880,884 ****
  			break;
  		case SERIAL_WAIT_ON_MASK:
! 			DEBUG_SERIAL(("serial_ioctl -> SERIAL_WAIT_ON_MASK %X\n", pser_inf->wait_mask));
  			pser_inf->event_pending = 1;
  			if (serial_get_event(handle, &result))
--- 883,888 ----
  			break;
  		case SERIAL_WAIT_ON_MASK:
! 			DEBUG_SERIAL(("serial_ioctl -> SERIAL_WAIT_ON_MASK %X\n",
! 				      pser_inf->wait_mask));
  			pser_inf->event_pending = 1;
  			if (serial_get_event(handle, &result))
***************
*** 986,990 ****
  		if (pser_inf->wait_mask & SERIAL_EV_DSR)
  		{
! 			DEBUG_SERIAL(("event -> SERIAL_EV_DSR %s\n", (bytes & TIOCM_DSR) ? "ON" : "OFF"));
  			*result |= SERIAL_EV_DSR;
  			ret = True;
--- 990,995 ----
  		if (pser_inf->wait_mask & SERIAL_EV_DSR)
  		{
! 			DEBUG_SERIAL(("event -> SERIAL_EV_DSR %s\n",
! 				      (bytes & TIOCM_DSR) ? "ON" : "OFF"));
  			*result |= SERIAL_EV_DSR;
  			ret = True;
***************
*** 997,1001 ****
  		if (pser_inf->wait_mask & SERIAL_EV_CTS)
  		{
! 			DEBUG_SERIAL((" EVENT-> SERIAL_EV_CTS %s\n", (bytes & TIOCM_CTS) ? "ON" : "OFF"));
  			*result |= SERIAL_EV_CTS;
  			ret = True;
--- 1002,1007 ----
  		if (pser_inf->wait_mask & SERIAL_EV_CTS)
  		{
! 			DEBUG_SERIAL((" EVENT-> SERIAL_EV_CTS %s\n",
! 				      (bytes & TIOCM_CTS) ? "ON" : "OFF"));
  			*result |= SERIAL_EV_CTS;
  			ret = True;

Index: xwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
retrieving revision 1.180
retrieving revision 1.181
diff -C2 -d -r1.180 -r1.181
*** xwin.c	18 Nov 2004 11:18:48 -0000	1.180
--- xwin.c	23 Nov 2004 13:29:12 -0000	1.181
***************
*** 967,974 ****
  	attribs.colormap = g_xcolmap;
  
! 	g_wnd = XCreateWindow(g_display, RootWindowOfScreen(g_screen), g_xpos, g_ypos, wndwidth, wndheight,
! 			      0, g_depth, InputOutput, g_visual,
! 			      CWBackPixel | CWBackingStore | CWOverrideRedirect |
! 			      CWColormap | CWBorderPixel, &attribs);
  
  	if (g_gc == NULL)
--- 967,974 ----
  	attribs.colormap = g_xcolmap;
  
! 	g_wnd = XCreateWindow(g_display, RootWindowOfScreen(g_screen), g_xpos, g_ypos, wndwidth,
! 			      wndheight, 0, g_depth, InputOutput, g_visual,
! 			      CWBackPixel | CWBackingStore | CWOverrideRedirect | CWColormap |
! 			      CWBorderPixel, &attribs);
  
  	if (g_gc == NULL)



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now. 
http://productguide.itmanagersjournal.com/
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.