JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cygwin: fix formatting: drop spaces leading tabs 

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2020-03-11 13:23:55 +01:00
parent 256bc8bde0
commit d2ef2331f9
47 changed files with 137 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
winsup/cygwin/autoload.cc
View File

@ -219,7 +219,7 @@ dll_func_load: \n\
jmp noload # Issue an error or return \n\
gotit: \n\
addq $40,%rsp # Revert stack \n\
pop %r10 # Pointer to 'return address' \n\
pop %r10 # Pointer to 'return address' \n\
movq %rax,12(%r10) # Move absolute address to address slot \n\
subq $25,%r10 # Point to jmp \n\
pop %rcx # Restore arg registers \n\

2
winsup/cygwin/cygserver_pwdgrp.h
View File

@ -29,7 +29,7 @@ private:
fetch_user_arg_type_t type;
union
{
BYTE sid[40];
BYTE sid[40];
char name[UNLEN + 1];
uint32_t id;
} arg;

2
winsup/cygwin/dir.cc
View File

@ -140,7 +140,7 @@ readdir_worker (DIR *dir, dirent *de)
if (is_dot_dot && !(dir->__flags & dirent_isroot))
de->d_ino = readdir_get_ino (((fhandler_base *)
dir->__fh)->get_name (),
dir->__fh)->get_name (),
true);
else
{

2
winsup/cygwin/dtable.cc
View File

@ -401,7 +401,7 @@ dtable::init_std_file_from_handle (int fd, HANDLE handle)
int openflags = O_BINARY;
/* Console windows are no kernel objects up to Windows 7/2008R2, so the
access mask returned by NtQueryInformationFile is meaningless. CMD
access mask returned by NtQueryInformationFile is meaningless. CMD
always hands down stdin handles as R/O handles, but our tty slave
sides are R/W. */
if (fh->is_tty ())

2
winsup/cygwin/external.cc
View File

@ -545,7 +545,7 @@ cygwin_internal (cygwin_getinfo_types t, ...)
break;
case CW_ALLOC_DRIVE_MAP:
{
{
dos_drive_mappings *ddm = new dos_drive_mappings ();
res = (uintptr_t) ddm;
}

2
winsup/cygwin/fhandler.h
View File

@ -167,7 +167,7 @@ class fhandler_base
struct status_flags
{
unsigned rbinary : 1; /* binary read mode */
unsigned rbinset : 1; /* binary read mode explicitly set */
unsigned rbinset : 1; /* binary read mode explicitly set */
unsigned wbinary : 1; /* binary write mode */
unsigned wbinset : 1; /* binary write mode explicitly set */
unsigned nohandle : 1; /* No handle associated with fhandler. */

2
winsup/cygwin/fhandler_disk_file.cc
View File

@ -827,7 +827,7 @@ fhandler_disk_file::fchmod (mode_t mode)
HANDLE fh;
if (NT_SUCCESS (NtOpenFile (&fh, FILE_WRITE_ATTRIBUTES,
pc.init_reopen_attr (attr, get_handle ()),
pc.init_reopen_attr (attr, get_handle ()),
&io, FILE_SHARE_VALID_FLAGS,
FILE_OPEN_FOR_BACKUP_INTENT)))
{

6
winsup/cygwin/fhandler_floppy.cc
View File

@ -546,11 +546,11 @@ fhandler_dev_floppy::raw_write (const void *ptr, size_t len)
DWORD cplen, written;
/* First check if we have an active read buffer. If so, try to fit in
the start of the input buffer and write out the entire result.
the start of the input buffer and write out the entire result.
This also covers the situation after lseek since lseek fills the read
buffer in case we seek to an address which is not sector aligned. */
if (devbufend && devbufstart < devbufend)
{
{
off_t current_pos = get_current_position ();
cplen = MIN (len, devbufend - devbufstart);
memcpy (devbuf + devbufstart, p, cplen);
@ -657,7 +657,7 @@ fhandler_dev_floppy::lseek (off_t offset, int whence)
off_t exact_pos = current_pos - (devbufend - devbufstart);
/* Shortcut when used to get current position. */
if (offset == 0)
return exact_pos;
return exact_pos;
offset += exact_pos;
whence = SEEK_SET;
}

2
winsup/cygwin/fhandler_proc.cc
View File

@ -74,7 +74,7 @@ static const virt_tab_t proc_tab[] = {
{ _VN ("sysvipc"), FH_PROCSYSVIPC, virt_directory, NULL },
{ _VN ("uptime"), FH_PROC, virt_file, format_proc_uptime },
{ _VN ("version"), FH_PROC, virt_file, format_proc_version },
{ NULL, 0, FH_NADA, virt_none, NULL }
{ NULL, 0, FH_NADA, virt_none, NULL }
};
#define PROC_DIR_COUNT 4

2
winsup/cygwin/fhandler_process.cc
View File

@ -1401,7 +1401,7 @@ get_process_state (DWORD dwProcessId)
n <<= 1;
PSYSTEM_PROCESS_INFORMATION new_p = (PSYSTEM_PROCESS_INFORMATION) realloc (p, n);
if (!new_p)
goto out;
goto out;
p = new_p;
}
if (!NT_SUCCESS (status))

2
winsup/cygwin/fhandler_termios.cc
View File

@ -438,7 +438,7 @@ fhandler_termios::line_edit (const char *rptr, size_t nread, termios& ti,
if (ti.c_lflag & ECHO)
doecho (&c, 1);
/* Write in chunks of 32 bytes to reduce the number of WriteFile calls
in non-canonical mode. */
in non-canonical mode. */
if ((!iscanon && ralen () >= 32) || input_done)
{
int status = accept_input ();

6
winsup/cygwin/flock.cc
View File

@ -801,7 +801,7 @@ lockf_t::create_lock_obj ()
pinfo p (myself->ppid);
if (!p) /* No access or not a Cygwin parent. */
return;
return;
parent_proc = OpenProcess (PROCESS_DUP_HANDLE
| PROCESS_CREATE_THREAD
@ -1025,7 +1025,7 @@ fhandler_base::lock (int a_op, struct flock *fl)
case SEEK_END:
if (get_device () != FH_FS)
start = 0;
start = 0;
else
{
NTSTATUS status;
@ -2015,7 +2015,7 @@ fhandler_disk_file::mand_lock (int a_op, struct flock *fl)
if (CancelSynchronousIo (thr->thread_handle ()))
thr->detach ();
else
thr->terminate_thread ();
thr->terminate_thread ();
if (NT_SUCCESS (lp.status))
NtUnlockFile (get_handle (), &io, &offset, &length, 0);
/* Per SUSv4: If a signal is received while fcntl is waiting,

4
winsup/cygwin/grp.cc
View File

@ -153,13 +153,13 @@ internal_getgrfull (fetch_acc_t &full_acc, cyg_ldap *pldap)
internal_getgrsid_cachedonly. */
if (cygheap->pg.nss_cygserver_caching ()
&& (ret = cygheap->pg.grp_cache.cygserver.add_group_from_cygserver
(full_acc.sid)))
(full_acc.sid)))
return ret;
if (cygheap->pg.nss_grp_files ())
{
cygheap->pg.grp_cache.file.check_file ();
if ((ret = cygheap->pg.grp_cache.file.add_group_from_file
(full_acc.sid)))
(full_acc.sid)))
return ret;
}
if (cygheap->pg.nss_grp_db ())

6
winsup/cygwin/hookapi.cc
View File

@ -42,9 +42,9 @@ PEHeaderFromHModule (HMODULE hModule, bool &is_64bit)
if (pNTHeader->Signature != IMAGE_NT_SIGNATURE)
pNTHeader = NULL;
else if (pNTHeader->FileHeader.Machine == IMAGE_FILE_MACHINE_AMD64)
is_64bit = true;
is_64bit = true;
else if (pNTHeader->FileHeader.Machine == IMAGE_FILE_MACHINE_I386)
is_64bit = false;
is_64bit = false;
else
pNTHeader = NULL;
}
@ -402,7 +402,7 @@ hook_or_detect_cygwin (const char *name, const void *fn, WORD& subsys, HANDLE h)
{
if (!ascii_strcasematch (rva (PSTR, map ?: (char *) hm, pd->Name - delta),
"cygwin1.dll"))
continue;
continue;
if (!fn)
{
/* Just checking if executable used cygwin1.dll. */

2
winsup/cygwin/include/a.out.h
View File

@ -138,7 +138,7 @@ struct external_scnhdr {
*/
struct external_lineno {
union {
uint32_t l_symndx; /* function name symbol index, iff l_lnno 0 */
uint32_t l_symndx; /* function name symbol index, iff l_lnno 0 */
uint32_t l_paddr; /* (physical) address of line number */
} l_addr;
uint16_t l_lnno; /* line number */

6
winsup/cygwin/include/cygwin/in6.h
View File

@ -74,9 +74,9 @@ struct in6_addr
{
union
{
uint8_t __s6_addr[16];
uint16_t __s6_addr16[8];
uint32_t __s6_addr32[4];
uint8_t __s6_addr[16];
uint16_t __s6_addr16[8];
uint32_t __s6_addr32[4];
} __u6;
#define s6_addr __u6.__s6_addr
#define s6_addr16 __u6.__s6_addr16

66
winsup/cygwin/include/cygwin/mtio.h
View File

@ -220,39 +220,39 @@ struct mtpos {
#define MT_ISSCSI2 0x72 /* Generic ANSI SCSI-2 tape unit */
/* More constants for mt_type. These are the codes used by Windows >= 5.1 */
#define MT_ISDDS_4mm 0x20
#define MT_ISMiniQic 0x21
#define MT_ISTravan 0x22
#define MT_ISQIC 0x23
#define MT_ISMP_8mm 0x24
#define MT_ISAME_8mm 0x25
#define MT_ISAIT1_8mm 0x26
#define MT_ISDLT 0x27
#define MT_ISNCTP 0x28
#define MT_ISIBM_3480 0x29
#define MT_ISIBM_3490E 0x2a
#define MT_ISIBM_Magstar_3590 0x2b
#define MT_ISIBM_Magstar_MP 0x2c
#define MT_ISSTK_DATA_D3 0x2d
#define MT_ISSONY_DTF 0x2e
#define MT_ISDV_6mm 0x2f
#define MT_ISDMI 0x30
#define MT_ISSONY_D2 0x31
#define MT_ISCLEANER_CARTRIDGE 0x32
#define MT_ISAVATAR_F2 0x4f
#define MT_ISMP2_8mm 0x50
#define MT_ISDST_S 0x51
#define MT_ISDST_M 0x52
#define MT_ISDST_L 0x53
#define MT_ISVXATape_1 0x54
#define MT_ISVXATape_2 0x55
#define MT_ISSTK_9840 0x56
#define MT_ISLTO_Ultrium 0x57
#define MT_ISLTO_Accelis 0x58
#define MT_ISAIT_8mm 0x5a
#define MT_ISADR_1 0x5b
#define MT_ISADR_2 0x5c
#define MT_ISSTK_9940 0x5d
#define MT_ISDDS_4mm 0x20
#define MT_ISMiniQic 0x21
#define MT_ISTravan 0x22
#define MT_ISQIC 0x23
#define MT_ISMP_8mm 0x24
#define MT_ISAME_8mm 0x25
#define MT_ISAIT1_8mm 0x26
#define MT_ISDLT 0x27
#define MT_ISNCTP 0x28
#define MT_ISIBM_3480 0x29
#define MT_ISIBM_3490E 0x2a
#define MT_ISIBM_Magstar_3590 0x2b
#define MT_ISIBM_Magstar_MP 0x2c
#define MT_ISSTK_DATA_D3 0x2d
#define MT_ISSONY_DTF 0x2e
#define MT_ISDV_6mm 0x2f
#define MT_ISDMI 0x30
#define MT_ISSONY_D2 0x31
#define MT_ISCLEANER_CARTRIDGE 0x32
#define MT_ISAVATAR_F2 0x4f
#define MT_ISMP2_8mm 0x50
#define MT_ISDST_S 0x51
#define MT_ISDST_M 0x52
#define MT_ISDST_L 0x53
#define MT_ISVXATape_1 0x54
#define MT_ISVXATape_2 0x55
#define MT_ISSTK_9840 0x56
#define MT_ISLTO_Ultrium 0x57
#define MT_ISLTO_Accelis 0x58
#define MT_ISAIT_8mm 0x5a
#define MT_ISADR_1 0x5b
#define MT_ISADR_2 0x5c
#define MT_ISSTK_9940 0x5d
struct mt_tape_info {
long t_type; /* device type id (mt_type) */

8
winsup/cygwin/include/cygwin/signal.h
View File

@ -362,7 +362,7 @@ struct sigaction
{
__extension__ union
{
_sig_func_ptr sa_handler; /* SIG_DFL, SIG_IGN, or pointer to a function */
_sig_func_ptr sa_handler; /* SIG_DFL, SIG_IGN, or pointer to a function */
#if __POSIX_VISIBLE >= 199309
void (*sa_sigaction) ( int, siginfo_t *, void * );
#endif
@ -371,12 +371,12 @@ struct sigaction
int sa_flags;
};
#define SA_NOCLDSTOP 1 /* Do not generate SIGCHLD when children
#define SA_NOCLDSTOP 1 /* Do not generate SIGCHLD when children
stop */
#define SA_SIGINFO 2 /* Invoke the signal catching function
#define SA_SIGINFO 2 /* Invoke the signal catching function
with three arguments instead of one
*/
#define SA_RESTART 0x10000000 /* Restart syscall on signal return */
#define SA_RESTART 0x10000000 /* Restart syscall on signal return */
#define SA_ONSTACK 0x20000000 /* Call signal handler on alternate
signal stack provided by
sigaltstack(2). */

2
winsup/cygwin/include/cygwin/socket.h
View File

@ -114,7 +114,7 @@ struct OLD_msghdr
struct iovec * msg_iov; /* Data blocks */
int msg_iovlen; /* Number of blocks */
void * msg_accrights; /* Per protocol magic */
/* (eg BSD descriptor passing) */
/* (eg BSD descriptor passing) */
int msg_accrightslen; /* Length of rights list */
};
#endif

2
winsup/cygwin/include/netinet/ip6.h
View File

@ -147,7 +147,7 @@ struct ip6_dest {
#define IP6OPT_RTALERT_LEN 4
#define IP6OPT_RTALERT_MLD 0 /* Datagram contains an MLD message */
#define IP6OPT_RTALERT_RSVP 1 /* Datagram contains an RSVP message */
#define IP6OPT_RTALERT_ACTNET 2 /* contains an Active Networks msg */
#define IP6OPT_RTALERT_ACTNET 2 /* contains an Active Networks msg */
#define IP6OPT_MINLEN 2
#define IP6OPT_EID 0x8a /* 10 0 01010 */

2
winsup/cygwin/include/resolv.h
View File

@ -151,7 +151,7 @@ struct res_sym {
struct __res_state_ext;
struct __res_state {
int retrans; /* retransmition time interval */
int retrans; /* retransmition time interval */
int retry; /* number of times to retransmit */
u_long options; /* option flags - see below. */
int nscount; /* number of name servers */

2
winsup/cygwin/libc/base64.c
View File

@ -212,7 +212,7 @@ b64_pton(char const *src, unsigned char *target, size_t targsize)
break;
pos = strchr(Base64, ch);
if (pos == 0) /* A non-base64 character. */
if (pos == 0) /* A non-base64 character. */
return (-1);
switch (state) {

2
winsup/cygwin/libc/getopt.c
View File

@ -75,7 +75,7 @@ char *optarg; /* argument associated with option */
/* return values */
#define BADCH (int)'?'
#define BADARG ((*options == ':') ? (int)':' : (int)'?')
#define INORDER (int)1
#define INORDER (int)1
#ifdef __CYGWIN__
static char EMSG[] = "";

4
winsup/cygwin/libc/rcmd.cc
View File

@ -97,7 +97,7 @@ extern "C" {
int cygwin_getaddrinfo (const char *, const char *, const struct addrinfo *,
struct addrinfo **);
int cygwin_getnameinfo (const struct sockaddr *, socklen_t, char *, size_t,
char *, size_t, int);
char *, size_t, int);
struct servent *cygwin_getservbyname (const char *, const char *);
int cygwin_listen (int, int);
int cygwin_rresvport_af(int *alport, int family);
@ -693,7 +693,7 @@ __ivaliduser_sa(FILE *hostf, const struct sockaddr *raddr, socklen_t salen,
else /* match a user by direct specification */
userok = !(strcmp(ruser, user+1));
break;
case '-': /* if we matched a hostname, */
case '-': /* if we matched a hostname, */
if (hostok) { /* check for user field rejections */
if (!*(user+1))
return(-1);

8
winsup/cygwin/libc/strfmon.c
View File

@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$");
/* internal macros */
#define PRINT(CH) do { \
if (dst >= s + maxsize) \
if (dst >= s + maxsize) \
goto e2big_error; \
*dst++ = CH; \
} while (0)
@ -111,9 +111,9 @@ static ssize_t
vstrfmon_l(char * __restrict s, size_t maxsize, locale_t loc,
const char * __restrict format, va_list ap)
{
char *dst; /* output destination pointer */
const char *fmt; /* current format poistion pointer */
struct lconv *lc; /* pointer to lconv structure */
char *dst; /* output destination pointer */
const char *fmt; /* current format poistion pointer */
struct lconv *lc; /* pointer to lconv structure */
char *asciivalue; /* formatted double pointer */
int flags; /* formatting options */

6
winsup/cygwin/libc/strptime.cc
View File

@ -703,8 +703,8 @@ literal:
const unsigned char *ep;
ep = find_string(bp, &i,
(const char * const *)tzname,
NULL, 2, locale);
(const char * const *)tzname,
NULL, 2, locale);
if (ep != NULL) {
tm->tm_isdst = i;
#ifdef TM_GMTOFF
@ -750,7 +750,7 @@ literal:
/* Check if year falls into the era. If not, it's an
invalid combination of era and offset. */
if (era->start.tm_year > tm->tm_year
|| era->end.tm_year < tm->tm_year)
|| era->end.tm_year < tm->tm_year)
return NULL;
tm->tm_year -= TM_YEAR_BASE;
}

2
winsup/cygwin/localtime.cc
View File

@ -1340,7 +1340,7 @@ tzparse(timezone_t sp, const char *name, const int lastditch)
for (year = EPOCH_YEAR;
sp->timecnt + 2 <= TZ_MAX_TIMES;
++year) {
time_t newfirst;
time_t newfirst;
starttime = transtime(janfirst, year, &start,
stdoffset);

2
winsup/cygwin/malloc_wrapper.cc
View File

@ -74,7 +74,7 @@ realloc (void *p, size_t size)
__malloc_unlock ();
}
malloc_printf ("(%p, %ld) = %p, called by %p", p, size, res,
caller_return_address ());
caller_return_address ());
return res;
}

2
winsup/cygwin/math/atanhl.c
View File

@ -26,7 +26,7 @@ long double atanhl (long double x)
}
/* Rearrange formula to avoid precision loss for small x.
atanh(x) = 0.5 * log ((1.0 + x)/(1.0 - x))
= 0.5 * log1p ((1.0 + x)/(1.0 - x) - 1.0)
= 0.5 * log1p ((1.0 + x)/(1.0 - x) - 1.0)
= 0.5 * log1p ((1.0 + x - 1.0 + x) /(1.0 - x))
= 0.5 * log1p ((2.0 * x ) / (1.0 - x)) */
z = 0.5L * __fast_log1pl ((z + z) / (1.0L - z));

12
winsup/cygwin/math/cephes_emath.h
View File

@ -30,7 +30,7 @@
* Author: S. L. Moshier.
*
* 6 Oct 02 Modified for MinGW by inlining utility routines,
* removing global variables, and splitting out strtold
* removing global variables, and splitting out strtold
* from _IO_ldtoa and _IO_ldtostr.
*
* Danny Smith <dannysmith@users.sourceforge.net>
@ -81,8 +81,8 @@
* __ediv( a, b, c ) c = b / a
* __efloor( a, b ) truncate to integer, toward -infinity
* __efrexp( a, exp, s ) extract exponent and significand
* __eifrac( e, &l, frac ) e to long integer and e type fraction
* __euifrac( e, &l, frac ) e to unsigned long integer and e type fraction
* __eifrac( e, &l, frac ) e to long integer and e type fraction
* __euifrac( e, &l, frac ) e to unsigned long integer and e type fraction
* __einfin( e ) set e to infinity, leaving its sign alone
* __eldexp( a, n, b ) multiply by 2**n
* __emov( a, b ) b = a
@ -97,10 +97,10 @@
* __etoe24( e, &f ) convert e type to IEEE single precision
* __etoe53( e, &d ) convert e type to IEEE double precision
* __etoe64( e, &d ) convert e type to IEEE long double precision
* __eisneg( e ) 1 if sign bit of e != 0, else 0
* __eisinf( e ) 1 if e has maximum exponent (non-IEEE)
* __eisneg( e ) 1 if sign bit of e != 0, else 0
* __eisinf( e ) 1 if e has maximum exponent (non-IEEE)
* or is infinite (IEEE)
* __eisnan( e ) 1 if e is a NaN
* __eisnan( e ) 1 if e is a NaN
* __esqrt( a, b ) b = square root of a
*
*

18
winsup/cygwin/math/exp2.S
View File

@ -26,15 +26,15 @@ __MINGW_USYMBOL(exp2):
cmpb $0x05, %dh
je 1f /* Is +-Inf, jump. */
fld %st
subq $8, %rsp /* int(x) */
fnstcw 4(%rsp)
movzwl 4(%rsp), %eax
orb $12, %ah
movw %ax, (%rsp)
fldcw (%rsp)
frndint
fldcw 4(%rsp)
addq $8, %rsp
subq $8, %rsp /* int(x) */
fnstcw 4(%rsp)
movzwl 4(%rsp), %eax
orb $12, %ah
movw %ax, (%rsp)
fldcw (%rsp)
frndint
fldcw 4(%rsp)
addq $8, %rsp
fsubr %st,%st(1) /* fract(x) */
fxch
f2xm1 /* 2^(fract(x)) - 1 */

18
winsup/cygwin/math/exp2l.S
View File

@ -24,15 +24,15 @@ __MINGW_USYMBOL(exp2l):
cmpb $0x05, %dh
je 1f /* Is +-Inf, jump. */
fld %st
subq $8, %rsp /* int(x) */
fnstcw 4(%rsp)
movzwl 4(%rsp), %eax
orb $12, %ah
movw %ax, (%rsp)
fldcw (%rsp)
frndint
fldcw 4(%rsp)
addq $8, %rsp
subq $8, %rsp /* int(x) */
fnstcw 4(%rsp)
movzwl 4(%rsp), %eax
orb $12, %ah
movw %ax, (%rsp)
fldcw (%rsp)
frndint
fldcw 4(%rsp)
addq $8, %rsp
fsubr %st,%st(1) /* fract(x) */
fxch
f2xm1 /* 2^(fract(x)) - 1 */

2
winsup/cygwin/math/ldexpl.c
View File

@ -13,7 +13,7 @@ long double ldexpl(long double x, int expn)
return x;
__asm__ __volatile__ ("fscale"
: "=t" (res)
: "=t" (res)
: "0" (x), "u" ((long double) expn));
if (!isfinite (res) || res == 0.0L)

2
winsup/cygwin/math/remquol.S
View File

@ -15,7 +15,7 @@
.globl __MINGW_USYMBOL(remquol)
__MINGW_USYMBOL(remquol):
#ifdef __x86_64__
pushq %rcx
pushq %rcx
fldt (%r8)
fldt (%rdx)
1: fprem1

4
winsup/cygwin/miscfuncs.cc
View File

@ -442,9 +442,9 @@ pthread_wrapper (PVOID arg)
movq 16(%%rbx), %%rcx # Load stackaddr into rcx \n\
movq 24(%%rbx), %%rsp # Load stackbase into rsp \n\
subq %[CYGTLS], %%rsp # Subtract CYGTLS_PADSIZE \n\
# (here we are 16 bytes aligned)\n\
# (here we are 16 bytes aligned)\n\
subq $32, %%rsp # Subtract another 32 bytes \n\
# (shadow space for arg regs) \n\
# (shadow space for arg regs) \n\
xorq %%rbp, %%rbp # Set rbp to 0 \n\
# We moved to the new stack. \n\
# Now it's safe to release the OS stack. \n\

8
winsup/cygwin/net.cc
View File

@ -1718,13 +1718,13 @@ gen_old_if_name (char *name, PIP_ADAPTER_ADDRESSES pap, DWORD idx)
prefix = "ppp";
break;
case IF_TYPE_SOFTWARE_LOOPBACK:
prefix = "lo";
prefix = "lo";
break;
case IF_TYPE_ATM:
prefix = "atm";
prefix = "atm";
break;
case IF_TYPE_IEEE80211:
prefix = "wlan";
prefix = "wlan";
break;
case IF_TYPE_SLIP:
case IF_TYPE_RS232:
@ -1732,7 +1732,7 @@ gen_old_if_name (char *name, PIP_ADAPTER_ADDRESSES pap, DWORD idx)
prefix = "slp";
break;
case IF_TYPE_TUNNEL:
prefix = "tun";
prefix = "tun";
break;
default:
prefix = "eth";

6
winsup/cygwin/nlsfuncs.cc
View File

@ -1420,7 +1420,7 @@ __set_charset_from_locale (const char *locale, char *charset)
break;
case 1258:
default:
if (lcid == 0x3c09 /* en_HK (English/Hong Kong) */
if (lcid == 0x3c09 /* en_HK (English/Hong Kong) */
|| lcid == 0x200c /* fr_RE (French/Réunion) */
|| lcid == 0x240c /* fr_CD (French/Congo) */
|| lcid == 0x280c /* fr_SN (French/Senegal) */
@ -1431,9 +1431,9 @@ __set_charset_from_locale (const char *locale, char *charset)
|| lcid == 0x3c0c /* fr_HT (French/Haiti) */
|| lcid == 0x0477 /* so_SO (Somali/Somali) */
|| lcid == 0x0430) /* st_ZA (Sotho/South Africa) */
cs = "ISO-8859-1";
cs = "ISO-8859-1";
else if (lcid == 0x818) /* ro_MD (Romanian/Moldovia) */
cs = "ISO-8859-2";
cs = "ISO-8859-2";
else if (lcid == 0x043a) /* mt_MT (Maltese/Malta) */
cs = "ISO-8859-3";
else if (lcid == 0x0481) /* mi_NZ (Maori/New Zealand) */

2
winsup/cygwin/ntdll.h
View File

@ -1470,7 +1470,7 @@ extern "C"
NTSTATUS NTAPI NtQueryInformationToken (HANDLE, TOKEN_INFORMATION_CLASS,
PVOID, ULONG, PULONG);
NTSTATUS NTAPI NtQueryObject (HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG,
PULONG);
PULONG);
NTSTATUS NTAPI NtQueryQuotaInformationFile (HANDLE, PIO_STATUS_BLOCK, PVOID,
ULONG, BOOLEAN, PVOID, ULONG,
PSID, BOOLEAN);

2
winsup/cygwin/passwd.cc
View File

@ -444,7 +444,7 @@ pg_ent::endent (bool _group)
if (state == from_file)
free (buf);
else if (state == from_local || state == from_sam)
NetApiBufferFree (buf);
NetApiBufferFree (buf);
buf = NULL;
}
if (!pg.curr_lines)

12
winsup/cygwin/path.cc
View File

@ -308,7 +308,7 @@ normalize_posix_path (const char *src, char *dst, char *&tail)
if (check_parent)
{
if (tail > dst_start) /* Don't check for / or // dir. */
{
{
*tail = 0;
debug_printf ("checking %s before '..'", dst);
/* In conjunction with native and NFS symlinks,
@ -2311,7 +2311,7 @@ symlink_info::check_sysfile (HANDLE h)
if (status != STATUS_END_OF_FILE)
set_error (EIO);
}
else if (*(PWCHAR) srcbuf == 0xfeff /* BOM */
else if (*(PWCHAR) srcbuf == 0xfeff /* BOM */
|| interix_symlink)
{
/* Add trailing 0 to Interix symlink target. Skip BOM in Cygwin
@ -2383,7 +2383,7 @@ check_reparse_point_target (HANDLE h, bool remote, PREPARSE_DATA_BUFFER rp,
if (status == STATUS_PENDING)
{
while (io.Status == (NTSTATUS) 0xffffffff)
Sleep (1L);
Sleep (1L);
status = io.Status;
}
if (!NT_SUCCESS (status))
@ -3890,7 +3890,7 @@ cygwin_conv_path_list (cygwin_conv_path_t what, const void *from, void *to,
ret = conv_path_list ((const char *) from, (char *) to, size, what);
/* Free winp buffer in case of CCP_WIN_W_TO_POSIX. */
if (winp)
free (winp);
free (winp);
/* Convert to WCHAR in case of CCP_POSIX_TO_WIN_W. */
if (orig_to)
sys_mbstowcs ((wchar_t *) orig_to, size / sizeof (WCHAR),
@ -4202,7 +4202,7 @@ find_fast_cwd_pointer ()
if (lock)
{
/* The lock instruction tweaks the LockCount member, which is not at
the start of the PRTL_CRITICAL_SECTION structure. So we have to
the start of the PRTL_CRITICAL_SECTION structure. So we have to
subtract the offset of LockCount to get the real address. */
PRTL_CRITICAL_SECTION lockaddr =
(PRTL_CRITICAL_SECTION) (lock + 9 + peek32 (lock + 4)
@ -4300,7 +4300,7 @@ find_fast_cwd_pointer ()
if (movedi[0] == 0x8b && movedi[1] == 0xff) /* mov %edi,%edi -> W8 */
{
/* Windows 8 does not call RtlEnterCriticalSection. The code manipulates
the FastPebLock manually, probably because RtlEnterCriticalSection has
the FastPebLock manually, probably because RtlEnterCriticalSection has
been converted to an inline function.
Next we search for a `mov some address,%eax'. This address points

4
winsup/cygwin/pwdgrp.h
View File

@ -132,7 +132,7 @@ public:
struct passwd *add_user_from_windows (cygpsid &sid, cyg_ldap *pldap = NULL)
{ return (struct passwd *) add_account_from_windows (sid, pldap); }
struct passwd *add_user_from_windows (const char *name,
cyg_ldap* pldap = NULL)
cyg_ldap* pldap = NULL)
{ return (struct passwd *) add_account_from_windows (name, pldap); }
struct passwd *add_user_from_windows (uint32_t id, cyg_ldap *pldap = NULL)
{ return (struct passwd *) add_account_from_windows (id, pldap); }
@ -163,7 +163,7 @@ public:
struct group *add_group_from_windows (uint32_t id, cyg_ldap *pldap = NULL)
{ return (struct group *) add_account_from_windows (id, pldap); }
struct group *add_group_from_windows (fetch_acc_t &full_acc,
cyg_ldap *pldap = NULL);
cyg_ldap *pldap = NULL);
struct group *find_group (cygpsid &sid);
struct group *find_group (const char *name);
struct group *find_group (gid_t gid);

6
winsup/cygwin/quotactl.cc
View File

@ -123,7 +123,7 @@ quotactl (int cmd, const char *special, int id, caddr_t addr)
case Q_SYNC:
/* No sync, just report success. */
status = STATUS_SUCCESS;
break;
break;
case Q_QUOTAON:
case Q_QUOTAOFF:
/* Ignore filename in addr. */
@ -141,7 +141,7 @@ quotactl (int cmd, const char *special, int id, caddr_t addr)
FileFsControlInformation);
break;
case Q_GETFMT:
__try
__try
{
uint32_t *retval = (uint32_t *) addr;
@ -176,7 +176,7 @@ quotactl (int cmd, const char *special, int id, caddr_t addr)
case Q_SETINFO:
/* No settings possible, just report success. */
status = STATUS_SUCCESS;
break;
break;
case Q_GETQUOTA:
/* Windows feature: Default limits. Get or set them with id == -1. */
if (id == -1)

2
winsup/cygwin/regex/cname.h
View File

@ -108,7 +108,7 @@ static struct cname {
{"four", '4'},
{"five", '5'},
{"six", '6'},
{"seven", '7'},
{"seven", '7'},
{"eight", '8'},
{"nine", '9'},
{"colon", ':'},

2
winsup/cygwin/regex/regcomp.c
View File

@ -1842,7 +1842,7 @@ computematchjumps(struct parse *p, struct re_guts *g)
suffix++;
}
if (suffix < g->mlen)
ssuffix = pmatches[ssuffix];
ssuffix = pmatches[ssuffix];
}
free(pmatches);

12
winsup/cygwin/regex/regex2.h
View File

@ -38,14 +38,14 @@
* First, the stuff that ends up in the outside-world include file
= typedef off_t regoff_t;
= typedef struct {
= int re_magic;
= size_t re_nsub; // number of parenthesized subexpressions
= const char *re_endp; // end pointer for REG_PEND
= struct re_guts *re_g; // none of your business :-)
= int re_magic;
= size_t re_nsub; // number of parenthesized subexpressions
= const char *re_endp; // end pointer for REG_PEND
= struct re_guts *re_g; // none of your business :-)
= } regex_t;
= typedef struct {
= regoff_t rm_so; // start of match
= regoff_t rm_eo; // end of match
= regoff_t rm_so; // start of match
= regoff_t rm_eo; // end of match
= } regmatch_t;
*/
/*

2
winsup/cygwin/security.cc
View File

@ -410,7 +410,7 @@ create_object_sd_from_attribute (uid_t uid, gid_t gid, mode_t attribute,
security_descriptor &sd)
{
return set_posix_access (attribute, uid, gid, NULL, 0, sd, false)
? 0 : -1;
? 0 : -1;
}
int

2
winsup/cygwin/times.cc
View File

@ -30,7 +30,7 @@ static inline void __attribute__ ((always_inline))
get_system_time (PLARGE_INTEGER systime)
{
wincap.has_precise_system_time ()
? GetSystemTimePreciseAsFileTime ((LPFILETIME) systime)
? GetSystemTimePreciseAsFileTime ((LPFILETIME) systime)
: GetSystemTimeAsFileTime ((LPFILETIME) systime);
}