white space

This commit is contained in:
Christopher Faylor 2005-08-12 02:39:13 +00:00
parent b4ec184199
commit 1cd065837c
16 changed files with 72 additions and 73 deletions

View File

@ -171,7 +171,7 @@ _cygtls::remove (DWORD wait)
if (wait) if (wait)
{ {
/* FIXME: Need some sort of atthreadexit function to allow things like /* FIXME: Need some sort of atthreadexit function to allow things like
select to control this themselves. */ select to control this themselves. */
if (locals.exitsock != INVALID_SOCKET) if (locals.exitsock != INVALID_SOCKET)
{ {
closesocket (locals.exitsock); closesocket (locals.exitsock);

View File

@ -68,7 +68,7 @@ get_full_path_of_dll (const char* str, char *name)
if (isabspath (name) || if (isabspath (name) ||
(ret = check_path_access ("LD_LIBRARY_PATH=", name, real_filename) (ret = check_path_access ("LD_LIBRARY_PATH=", name, real_filename)
?: check_path_access ("/usr/lib", name, real_filename)) == NULL) ?: check_path_access ("/usr/lib", name, real_filename)) == NULL)
real_filename.check (name, PC_SYM_FOLLOW | PC_NOFULL | PC_NULLEMPTY); /* Convert */ real_filename.check (name, PC_SYM_FOLLOW | PC_NOFULL | PC_NULLEMPTY); /* Convert */
if (!real_filename.error) if (!real_filename.error)

View File

@ -311,7 +311,7 @@ cygwin_internal (cygwin_getinfo_types t, ...)
try_to_debug (); try_to_debug ();
break; break;
default: default:
break; break;
} }
return (unsigned long) -1; return (unsigned long) -1;
} }

View File

@ -59,11 +59,11 @@ fhandler_mailslot::open (int flags, mode_t mode)
{ {
case O_RDONLY: /* Server */ case O_RDONLY: /* Server */
x = CreateMailslot (get_win32_name (), x = CreateMailslot (get_win32_name (),
0, /* Any message size */ 0, /* Any message size */
(flags & O_NONBLOCK) ? 0 : MAILSLOT_WAIT_FOREVER, (flags & O_NONBLOCK) ? 0 : MAILSLOT_WAIT_FOREVER,
&sec_none); &sec_none);
if (x == INVALID_HANDLE_VALUE) if (x == INVALID_HANDLE_VALUE)
{ {
/* FIXME: It's not possible to open the read side of an existing /* FIXME: It's not possible to open the read side of an existing
mailslot using CreateFile. You'll get a handle, but using it mailslot using CreateFile. You'll get a handle, but using it
in ReadFile returns ERROR_INVALID_PARAMETER. On the other in ReadFile returns ERROR_INVALID_PARAMETER. On the other
@ -95,10 +95,10 @@ fhandler_mailslot::open (int flags, mode_t mode)
break; break;
case O_WRONLY: /* Client */ case O_WRONLY: /* Client */
/* The client is the DLL exclusively. Don't allow opening from /* The client is the DLL exclusively. Don't allow opening from
application code. */ application code. */
extern fhandler_mailslot *dev_kmsg; extern fhandler_mailslot *dev_kmsg;
if (this != dev_kmsg) if (this != dev_kmsg)
{ {
set_errno (EPERM); /* As on Linux. */ set_errno (EPERM); /* As on Linux. */
break; break;
} }

View File

@ -66,9 +66,9 @@ thread_netdrive (void *arg)
ndi->ret = WNetGetResourceInformation ((LPNETRESOURCE) ndi->in, ndi->ret = WNetGetResourceInformation ((LPNETRESOURCE) ndi->in,
nro, &size, &dummy); nro, &size, &dummy);
if (ndi->ret != NO_ERROR) if (ndi->ret != NO_ERROR)
break; break;
if (ndi->what == GET_RESOURCE_OPENENUMTOP) if (ndi->what == GET_RESOURCE_OPENENUMTOP)
{ {
nro2 = nro; nro2 = nro;
nro = (LPNETRESOURCE) alloca (size = 4096); nro = (LPNETRESOURCE) alloca (size = 4096);
ndi->ret = WNetGetResourceParent (nro2, nro, &size); ndi->ret = WNetGetResourceParent (nro2, nro, &size);
@ -78,7 +78,7 @@ thread_netdrive (void *arg)
ndi->ret = WNetOpenEnum (RESOURCE_GLOBALNET, RESOURCETYPE_DISK, 0, nro, ndi->ret = WNetOpenEnum (RESOURCE_GLOBALNET, RESOURCETYPE_DISK, 0, nro,
&enumhdl); &enumhdl);
if (ndi->ret == NO_ERROR) if (ndi->ret == NO_ERROR)
*(HANDLE *) ndi->out = enumhdl; *(HANDLE *) ndi->out = enumhdl;
break; break;
case GET_RESOURCE_ENUM: case GET_RESOURCE_ENUM:
ndi->ret = WNetEnumResource ((HANDLE) ndi->in, (size = 1, &size), ndi->ret = WNetEnumResource ((HANDLE) ndi->in, (size = 1, &size),
@ -161,7 +161,7 @@ fhandler_netdrive::readdir (DIR *dir)
NETRESOURCE nr = { 0 }; NETRESOURCE nr = { 0 };
if (len == 2) /* // */ if (len == 2) /* // */
{ {
namebuf = (char *) alloca (MAX_COMPUTERNAME_LENGTH + 3); namebuf = (char *) alloca (MAX_COMPUTERNAME_LENGTH + 3);
strcpy (namebuf, "\\\\"); strcpy (namebuf, "\\\\");
size = MAX_COMPUTERNAME_LENGTH + 1; size = MAX_COMPUTERNAME_LENGTH + 1;
@ -172,7 +172,7 @@ fhandler_netdrive::readdir (DIR *dir)
} }
} }
else else
{ {
const char *from; const char *from;
char *to; char *to;
namebuf = (char *) alloca (len + 1); namebuf = (char *) alloca (len + 1);
@ -195,7 +195,7 @@ fhandler_netdrive::readdir (DIR *dir)
} }
} }
ret = create_thread_and_wait (GET_RESOURCE_ENUM, dir->__handle, ret = create_thread_and_wait (GET_RESOURCE_ENUM, dir->__handle,
nro = (LPNETRESOURCE) alloca (16384), nro = (LPNETRESOURCE) alloca (16384),
16384, "WnetEnumResource"); 16384, "WnetEnumResource");
if (ret != NO_ERROR) if (ret != NO_ERROR)
{ {

View File

@ -385,42 +385,42 @@ fhandler_serial::switch_modem_lines (int set, int clr)
if (set & TIOCM_RTS) if (set & TIOCM_RTS)
{ {
if (EscapeCommFunction (get_handle (), SETRTS)) if (EscapeCommFunction (get_handle (), SETRTS))
rts = TIOCM_RTS; rts = TIOCM_RTS;
else else
{ {
__seterrno (); __seterrno ();
res = -1; res = -1;
} }
} }
else if (clr & TIOCM_RTS) else if (clr & TIOCM_RTS)
{ {
if (EscapeCommFunction (get_handle (), CLRRTS)) if (EscapeCommFunction (get_handle (), CLRRTS))
rts = 0; rts = 0;
else else
{ {
__seterrno (); __seterrno ();
res = -1; res = -1;
} }
} }
if (set & TIOCM_DTR) if (set & TIOCM_DTR)
{ {
if (EscapeCommFunction (get_handle (), SETDTR)) if (EscapeCommFunction (get_handle (), SETDTR))
rts = TIOCM_DTR; rts = TIOCM_DTR;
else else
{ {
__seterrno (); __seterrno ();
res = -1; res = -1;
} }
} }
else if (clr & TIOCM_DTR) else if (clr & TIOCM_DTR)
{ {
if (EscapeCommFunction (get_handle (), CLRDTR)) if (EscapeCommFunction (get_handle (), CLRDTR))
rts = 0; rts = 0;
else else
{ {
__seterrno (); __seterrno ();
res = -1; res = -1;
} }
} }
return res; return res;
@ -482,17 +482,17 @@ fhandler_serial::ioctl (unsigned int cmd, void *buffer)
} }
break; break;
case TIOCMSET: case TIOCMSET:
if (switch_modem_lines (ipbuffer, ~ipbuffer)) if (switch_modem_lines (ipbuffer, ~ipbuffer))
res = -1; res = -1;
break; break;
case TIOCMBIS: case TIOCMBIS:
if (switch_modem_lines (ipbuffer, 0)) if (switch_modem_lines (ipbuffer, 0))
res = -1; res = -1;
break; break;
case TIOCMBIC: case TIOCMBIC:
if (switch_modem_lines (0, ipbuffer)) if (switch_modem_lines (0, ipbuffer))
res = -1; res = -1;
break; break;
case TIOCCBRK: case TIOCCBRK:
if (ClearCommBreak (get_handle ()) == 0) if (ClearCommBreak (get_handle ()) == 0)
{ {

View File

@ -110,7 +110,7 @@ get_inet_addr (const struct sockaddr *in, int inlen,
ret = 1; ret = 1;
} }
else else
__seterrno (); __seterrno ();
CloseHandle (fh); CloseHandle (fh);
return ret; return ret;
} }

View File

@ -87,30 +87,29 @@ int scandir (const char *__dir,
int alphasort (const struct dirent **__a, const struct dirent **__b); int alphasort (const struct dirent **__a, const struct dirent **__b);
/* File types for `d_type'. */ /* File types for `d_type'. */
enum enum
{ {
DT_UNKNOWN = 0, DT_UNKNOWN = 0,
# define DT_UNKNOWN DT_UNKNOWN # define DT_UNKNOWN DT_UNKNOWN
DT_FIFO = 1, DT_FIFO = 1,
# define DT_FIFO DT_FIFO # define DT_FIFO DT_FIFO
DT_CHR = 2, DT_CHR = 2,
# define DT_CHR DT_CHR # define DT_CHR DT_CHR
DT_DIR = 4, DT_DIR = 4,
# define DT_DIR DT_DIR # define DT_DIR DT_DIR
DT_BLK = 6, DT_BLK = 6,
# define DT_BLK DT_BLK # define DT_BLK DT_BLK
DT_REG = 8, DT_REG = 8,
# define DT_REG DT_REG # define DT_REG DT_REG
DT_LNK = 10, DT_LNK = 10,
# define DT_LNK DT_LNK # define DT_LNK DT_LNK
DT_SOCK = 12, DT_SOCK = 12,
# define DT_SOCK DT_SOCK # define DT_SOCK DT_SOCK
DT_WHT = 14 DT_WHT = 14
# define DT_WHT DT_WHT # define DT_WHT DT_WHT
}; };
/* Convert between stat structure types and directory types. */ /* Convert between stat structure types and directory types. */
# define IFTODT(mode) (((mode) & 0170000) >> 12) # define IFTODT(mode) (((mode) & 0170000) >> 12)
# define DTTOIF(dirtype) ((dirtype) << 12) # define DTTOIF(dirtype) ((dirtype) << 12)
#endif /* _POSIX_SOURCE */ #endif /* _POSIX_SOURCE */
#endif /*_SYS_DIRENT_H*/
#endif

View File

@ -2272,7 +2272,7 @@ cygwin_inet_pton (int family, const char *strptr, void *addrptr)
struct in_addr in_val; struct in_addr in_val;
if (cygwin_inet_aton (strptr, &in_val)) if (cygwin_inet_aton (strptr, &in_val))
{ {
memcpy (addrptr, &in_val, sizeof (struct in_addr)); memcpy (addrptr, &in_val, sizeof (struct in_addr));
return 1; return 1;
} }
@ -2298,7 +2298,7 @@ cygwin_inet_ntop (int family, const void *addrptr, char *strptr, size_t len)
__small_sprintf (temp, "%u.%u.%u.%u", p[0], p[1], p[2], p[3]); __small_sprintf (temp, "%u.%u.%u.%u", p[0], p[1], p[2], p[3]);
if (strlen (temp) >= len) if (strlen (temp) >= len)
{ {
set_errno (ENOSPC); set_errno (ENOSPC);
return NULL; return NULL;
} }

View File

@ -1354,7 +1354,7 @@ get_reg_security (HANDLE handle, security_descriptor &sd_ret)
if (ret == ERROR_INSUFFICIENT_BUFFER) if (ret == ERROR_INSUFFICIENT_BUFFER)
{ {
if (!sd_ret.malloc (len)) if (!sd_ret.malloc (len))
set_errno (ENOMEM); set_errno (ENOMEM);
else else
ret = RegGetKeySecurity ((HKEY) handle, ret = RegGetKeySecurity ((HKEY) handle,
DACL_SECURITY_INFORMATION DACL_SECURITY_INFORMATION

View File

@ -1799,12 +1799,12 @@ statvfs (const char *fname, struct statvfs *sfs)
if (!status && statusex) if (!status && statusex)
{ {
/* Grrr, this can happen on 9x when a share isn't attached to /* Grrr, this can happen on 9x when a share isn't attached to
a drive letter. Fake, fake, hoorah. */ a drive letter. Fake, fake, hoorah. */
status = TRUE; status = TRUE;
bps = 512; bps = 512;
spc = 8; spc = 8;
while ((totalb.QuadPart % (spc*bps)) && spc > 1) while ((totalb.QuadPart % (spc*bps)) && spc > 1)
spc >>= 1; spc >>= 1;
} }
if (status) if (status)
{ {

View File

@ -2638,7 +2638,7 @@ pthread_cond_timedwait (pthread_cond_t *cond, pthread_mutex_t *mutex,
evaluate microseconds directly in DWORD. */ evaluate microseconds directly in DWORD. */
if (tv.tv_sec > abstime->tv_sec if (tv.tv_sec > abstime->tv_sec
|| (tv.tv_sec == abstime->tv_sec || (tv.tv_sec == abstime->tv_sec
&& tv.tv_usec > abstime->tv_nsec / 1000)) && tv.tv_usec > abstime->tv_nsec / 1000))
return ETIMEDOUT; return ETIMEDOUT;
waitlength = (abstime->tv_sec - tv.tv_sec) * 1000; waitlength = (abstime->tv_sec - tv.tv_sec) * 1000;