Indent fixes
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@607 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
parent
20c5eb1ef3
commit
731c8164a2
2
disk.c
2
disk.c
@ -185,7 +185,7 @@ convert_1970_to_filetime(uint32 high, uint32 low)
|
|||||||
/* optarg looks like ':h:=/mnt/floppy,b:=/mnt/usbdevice1' */
|
/* optarg looks like ':h:=/mnt/floppy,b:=/mnt/usbdevice1' */
|
||||||
/* when it arrives to this function. */
|
/* when it arrives to this function. */
|
||||||
int
|
int
|
||||||
disk_enum_devices(uint32 *id, char *optarg)
|
disk_enum_devices(uint32 * id, char *optarg)
|
||||||
{
|
{
|
||||||
char *pos = optarg;
|
char *pos = optarg;
|
||||||
char *pos2;
|
char *pos2;
|
||||||
|
@ -29,7 +29,7 @@ get_parallel_data(HANDLE handle)
|
|||||||
/* optarg looks like ':LPT1=/dev/lp0' */
|
/* optarg looks like ':LPT1=/dev/lp0' */
|
||||||
/* when it arrives to this function. */
|
/* when it arrives to this function. */
|
||||||
int
|
int
|
||||||
parallel_enum_devices(uint32 *id, char *optarg)
|
parallel_enum_devices(uint32 * id, char *optarg)
|
||||||
{
|
{
|
||||||
PARALLEL_DEVICE *ppar_info;
|
PARALLEL_DEVICE *ppar_info;
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@ get_printer_data(HANDLE handle)
|
|||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
printer_enum_devices(uint32 *id, char *optarg)
|
printer_enum_devices(uint32 * id, char *optarg)
|
||||||
{
|
{
|
||||||
PRINTER *pprinter_data;
|
PRINTER *pprinter_data;
|
||||||
|
|
||||||
|
@ -149,8 +149,8 @@ printercache_process(STREAM s)
|
|||||||
in_uint32_le(s, type);
|
in_uint32_le(s, type);
|
||||||
switch (type)
|
switch (type)
|
||||||
{
|
{
|
||||||
/*case 4: renaming of item old name and then new name */
|
/*case 4: renaming of item old name and then new name */
|
||||||
/*case 3: delete item name */
|
/*case 3: delete item name */
|
||||||
case 2:
|
case 2:
|
||||||
in_uint32_le(s, printer_unicode_length);
|
in_uint32_le(s, printer_unicode_length);
|
||||||
in_uint32_le(s, blob_length);
|
in_uint32_le(s, blob_length);
|
||||||
@ -162,7 +162,7 @@ printercache_process(STREAM s)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/*case 1: */
|
/*case 1: */
|
||||||
// TODO: I think this one just tells us what printer is on LPT? but why?
|
// TODO: I think this one just tells us what printer is on LPT? but why?
|
||||||
|
|
||||||
//
|
//
|
||||||
|
8
proto.h
8
proto.h
@ -31,7 +31,7 @@ NTSTATUS disk_query_information(HANDLE handle, uint32 info_class, STREAM out);
|
|||||||
NTSTATUS disk_set_information(HANDLE handle, uint32 info_class, STREAM in, STREAM out);
|
NTSTATUS disk_set_information(HANDLE handle, uint32 info_class, STREAM in, STREAM out);
|
||||||
NTSTATUS disk_query_volume_information(HANDLE handle, uint32 info_class, STREAM out);
|
NTSTATUS disk_query_volume_information(HANDLE handle, uint32 info_class, STREAM out);
|
||||||
NTSTATUS disk_query_directory(HANDLE handle, uint32 info_class, char *pattern, STREAM out);
|
NTSTATUS disk_query_directory(HANDLE handle, uint32 info_class, char *pattern, STREAM out);
|
||||||
int disk_enum_devices(uint32 *id, char *optarg);
|
int disk_enum_devices(uint32 * id, char *optarg);
|
||||||
/* ewmhints.c */
|
/* ewmhints.c */
|
||||||
int get_current_workarea(uint32 * x, uint32 * y, uint32 * width, uint32 * height);
|
int get_current_workarea(uint32 * x, uint32 * y, uint32 * width, uint32 * height);
|
||||||
/* iso.c */
|
/* iso.c */
|
||||||
@ -53,9 +53,9 @@ void mcs_disconnect(void);
|
|||||||
void process_orders(STREAM s, uint16 num_orders);
|
void process_orders(STREAM s, uint16 num_orders);
|
||||||
void reset_order_state(void);
|
void reset_order_state(void);
|
||||||
/* parallel.c */
|
/* parallel.c */
|
||||||
int parallel_enum_devices(uint32 *id, char *optarg);
|
int parallel_enum_devices(uint32 * id, char *optarg);
|
||||||
/* printer.c */
|
/* printer.c */
|
||||||
int printer_enum_devices(uint32 *id, char *optarg);
|
int printer_enum_devices(uint32 * id, char *optarg);
|
||||||
/* printercache.c */
|
/* printercache.c */
|
||||||
int printercache_load_blob(char *printer_name, uint8 ** data);
|
int printercache_load_blob(char *printer_name, uint8 ** data);
|
||||||
void printercache_process(STREAM s);
|
void printercache_process(STREAM s);
|
||||||
@ -132,7 +132,7 @@ BOOL sec_connect(char *server, char *username);
|
|||||||
void sec_disconnect(void);
|
void sec_disconnect(void);
|
||||||
/* serial.c */
|
/* serial.c */
|
||||||
BOOL serial_get_timeout(uint32 handle, uint32 length, uint32 * timeout, uint32 * itv_timeout);
|
BOOL serial_get_timeout(uint32 handle, uint32 length, uint32 * timeout, uint32 * itv_timeout);
|
||||||
int serial_enum_devices(uint32 *id, char *optarg);
|
int serial_enum_devices(uint32 * id, char *optarg);
|
||||||
/* tcp.c */
|
/* tcp.c */
|
||||||
STREAM tcp_init(uint32 maxlen);
|
STREAM tcp_init(uint32 maxlen);
|
||||||
void tcp_send(STREAM s);
|
void tcp_send(STREAM s);
|
||||||
|
12
rdesktop.c
12
rdesktop.c
@ -118,14 +118,18 @@ usage(char *program)
|
|||||||
fprintf(stderr, " -N: enable numlock syncronization\n");
|
fprintf(stderr, " -N: enable numlock syncronization\n");
|
||||||
fprintf(stderr, " -a: connection colour depth\n");
|
fprintf(stderr, " -a: connection colour depth\n");
|
||||||
fprintf(stderr, " -r: enable specified device redirection (this flag can be repeated)\n");
|
fprintf(stderr, " -r: enable specified device redirection (this flag can be repeated)\n");
|
||||||
fprintf(stderr, " '-r comport:COM1=/dev/ttyS0': enable serial redirection of /dev/ttyS0 to COM1\n");
|
fprintf(stderr,
|
||||||
|
" '-r comport:COM1=/dev/ttyS0': enable serial redirection of /dev/ttyS0 to COM1\n");
|
||||||
fprintf(stderr, " or COM1=/dev/ttyS0,COM2=/dev/ttyS1\n");
|
fprintf(stderr, " or COM1=/dev/ttyS0,COM2=/dev/ttyS1\n");
|
||||||
fprintf(stderr, " '-r disk:A=/mnt/floppy': enable redirection of /mnt/floppy to A:\n");
|
fprintf(stderr,
|
||||||
|
" '-r disk:A=/mnt/floppy': enable redirection of /mnt/floppy to A:\n");
|
||||||
fprintf(stderr, " or A=/mnt/floppy,D=/mnt/cdrom'\n");
|
fprintf(stderr, " or A=/mnt/floppy,D=/mnt/cdrom'\n");
|
||||||
fprintf(stderr, " '-r lptport:LPT1=/dev/lp0': enable parallel redirection of /dev/lp0 to LPT1\n");
|
fprintf(stderr,
|
||||||
|
" '-r lptport:LPT1=/dev/lp0': enable parallel redirection of /dev/lp0 to LPT1\n");
|
||||||
fprintf(stderr, " or LPT1=/dev/lp0,LPT2=/dev/lp1\n");
|
fprintf(stderr, " or LPT1=/dev/lp0,LPT2=/dev/lp1\n");
|
||||||
fprintf(stderr, " '-r printer:mydeskjet': enable printer redirection\n");
|
fprintf(stderr, " '-r printer:mydeskjet': enable printer redirection\n");
|
||||||
fprintf(stderr, " or mydeskjet=\"HP LaserJet IIIP\" to enter server driver as well\n");
|
fprintf(stderr,
|
||||||
|
" or mydeskjet=\"HP LaserJet IIIP\" to enter server driver as well\n");
|
||||||
fprintf(stderr, " '-r sound': enable sound redirection\n");
|
fprintf(stderr, " '-r sound': enable sound redirection\n");
|
||||||
fprintf(stderr, " -0: attach to console\n");
|
fprintf(stderr, " -0: attach to console\n");
|
||||||
fprintf(stderr, " -4: use RDP version 4\n");
|
fprintf(stderr, " -4: use RDP version 4\n");
|
||||||
|
7
rdpdr.c
7
rdpdr.c
@ -836,8 +836,8 @@ rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out)
|
|||||||
status = STATUS_SUCCESS;
|
status = STATUS_SUCCESS;
|
||||||
rdpdr_send_completion(iorq->device,
|
rdpdr_send_completion(iorq->device,
|
||||||
iorq->id, status,
|
iorq->id, status,
|
||||||
iorq->partial_len, (uint8*)"",
|
iorq->partial_len,
|
||||||
1);
|
(uint8 *) "", 1);
|
||||||
|
|
||||||
xfree(iorq->buffer);
|
xfree(iorq->buffer);
|
||||||
iorq->fd = 0;
|
iorq->fd = 0;
|
||||||
@ -881,7 +881,8 @@ rdpdr_abort_io(uint32 fd, uint32 major, NTSTATUS status)
|
|||||||
if ((iorq->fd == fd) && (major == 0 || iorq->major == major))
|
if ((iorq->fd == fd) && (major == 0 || iorq->major == major))
|
||||||
{
|
{
|
||||||
result = 0;
|
result = 0;
|
||||||
rdpdr_send_completion(iorq->device, iorq->id, status, result, (uint8*)"", 1);
|
rdpdr_send_completion(iorq->device, iorq->id, status, result, (uint8 *) "",
|
||||||
|
1);
|
||||||
xfree(iorq->buffer);
|
xfree(iorq->buffer);
|
||||||
iorq->fd = 0;
|
iorq->fd = 0;
|
||||||
if (prev != NULL)
|
if (prev != NULL)
|
||||||
|
2
serial.c
2
serial.c
@ -327,7 +327,7 @@ set_termios(SERIAL_DEVICE * pser_inf, HANDLE serial_fd)
|
|||||||
/* when it arrives to this function. */
|
/* when it arrives to this function. */
|
||||||
/* :com1=/dev/ttyS0,com2=/dev/ttyS1 */
|
/* :com1=/dev/ttyS0,com2=/dev/ttyS1 */
|
||||||
int
|
int
|
||||||
serial_enum_devices(uint32 *id, char *optarg)
|
serial_enum_devices(uint32 * id, char *optarg)
|
||||||
{
|
{
|
||||||
SERIAL_DEVICE *pser_inf;
|
SERIAL_DEVICE *pser_inf;
|
||||||
|
|
||||||
|
2
xclip.c
2
xclip.c
@ -310,7 +310,7 @@ ui_clip_handle_data(uint8 * data, uint32 length)
|
|||||||
crlf2lf(data, &length);
|
crlf2lf(data, &length);
|
||||||
|
|
||||||
/* Only send data up to null byte, if any */
|
/* Only send data up to null byte, if any */
|
||||||
firstnull = (uint8 *)strchr((char*)data, '\0');
|
firstnull = (uint8 *) strchr((char *) data, '\0');
|
||||||
if (firstnull)
|
if (firstnull)
|
||||||
{
|
{
|
||||||
length = firstnull - data + 1;
|
length = firstnull - data + 1;
|
||||||
|
Loading…
Reference in New Issue
Block a user