libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Respond to a multitude of g++ warnings.

This commit is contained in:
Christopher Faylor 2000-02-21 05:20:38 +00:00
parent 17869f8bf7
commit 9cec3d45aa
30 changed files with 106 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,7 @@
Mon Feb 21 00:19:40 2000 Christopher Faylor <cgf@cygnus.com>
Respond to a multitude of new g++ warnings.
Sun Feb 20 22:10:21 2000 Christopher Faylor <cgf@cygnus.com> Sun Feb 20 22:10:21 2000 Christopher Faylor <cgf@cygnus.com>
* environ.cc (getwinenv): Make __stdcall. * environ.cc (getwinenv): Make __stdcall.

14
winsup/cygwin/dcrt0.cc
View File

@ -22,8 +22,8 @@ details. */
HANDLE NO_COPY hMainProc = NULL; HANDLE NO_COPY hMainProc = NULL;
HANDLE NO_COPY hMainThread = NULL; HANDLE NO_COPY hMainThread = NULL;
static per_process dummy_user_data = {0}; static NO_COPY char dummy_user_data[sizeof (per_process)] = {0};
per_process NO_COPY *user_data = &dummy_user_data; per_process NO_COPY *user_data = (per_process *) &dummy_user_data;
per_thread_waitq NO_COPY waitq_storage; per_thread_waitq NO_COPY waitq_storage;
per_thread_vfork NO_COPY vfork_storage; per_thread_vfork NO_COPY vfork_storage;
@ -94,7 +94,7 @@ do_global_ctors (void (**in_pfunc)(), int force)
while (--pfunc > in_pfunc) while (--pfunc > in_pfunc)
(*pfunc) (); (*pfunc) ();
if (user_data != &dummy_user_data) if (user_data != (per_process *) &dummy_user_data)
atexit (do_global_dtors); atexit (do_global_dtors);
} }
@ -260,7 +260,7 @@ isquote (char c)
/* Step over a run of characters delimited by quotes */ /* Step over a run of characters delimited by quotes */
static __inline char * static __inline char *
quoted (char *word, char *cmd, int winshell) quoted (char *cmd, int winshell)
{ {
char *p; char *p;
char quote = *cmd; char quote = *cmd;
@ -418,7 +418,7 @@ build_argv (char *cmd, char **&argv, int &argc, int winshell)
/* Skip over characters until the closing quote */ /* Skip over characters until the closing quote */
{ {
sawquote = cmd; sawquote = cmd;
cmd = quoted (word, cmd, winshell); cmd = quoted (cmd, winshell);
} }
if (issep (*cmd)) // End of argument if space if (issep (*cmd)) // End of argument if space
break; break;
@ -502,7 +502,7 @@ static MEMORY_BASIC_INFORMATION sm;
#define EBP 6 #define EBP 6
#define ESP 7 #define ESP 7
extern void __inline__ extern __inline__ void
alloc_stack_hard_way (child_info_fork *ci, volatile char *b) alloc_stack_hard_way (child_info_fork *ci, volatile char *b)
{ {
void *new_stack_pointer; void *new_stack_pointer;
@ -535,7 +535,7 @@ alloc_stack_hard_way (child_info_fork *ci, volatile char *b)
/* extend the stack prior to fork longjmp */ /* extend the stack prior to fork longjmp */
extern void __inline__ extern __inline__ void
alloc_stack (child_info_fork *ci) alloc_stack (child_info_fork *ci)
{ {
/* FIXME: adding 16384 seems to avoid a stack copy problem during /* FIXME: adding 16384 seems to avoid a stack copy problem during

4
winsup/cygwin/environ.cc
View File

@ -42,7 +42,7 @@ static win_env conv_envvars[] =
return_MAX_PATH, return_MAX_PATH}, return_MAX_PATH, return_MAX_PATH},
{"LD_LIBRARY_PATH=", 16, NULL, NULL, cygwin_conv_to_full_posix_path, {"LD_LIBRARY_PATH=", 16, NULL, NULL, cygwin_conv_to_full_posix_path,
cygwin_conv_to_full_win32_path, return_MAX_PATH, return_MAX_PATH}, cygwin_conv_to_full_win32_path, return_MAX_PATH, return_MAX_PATH},
{NULL} {NULL, 0, NULL, NULL, NULL, NULL, 0, 0}
}; };
void void
@ -260,7 +260,7 @@ unsetenv (const char *name)
/* Turn environment variable part of a=b string into uppercase. */ /* Turn environment variable part of a=b string into uppercase. */
static void __inline static __inline__ void
ucenv (char *p, char *eq) ucenv (char *p, char *eq)
{ {
/* Amazingly, NT has a case sensitive environment name list, /* Amazingly, NT has a case sensitive environment name list,

2
winsup/cygwin/exceptions.cc
View File

@ -439,7 +439,7 @@ stackdump (HANDLE hproc, HANDLE hthread, EXCEPTION_RECORD *e, CONTEXT *in)
/* Main exception handler. */ /* Main exception handler. */
static int static int
handle_exceptions (EXCEPTION_RECORD *e, void *arg, CONTEXT *in, void *x) handle_exceptions (EXCEPTION_RECORD *e, void *, CONTEXT *in, void *)
{ {
int sig; int sig;

18
winsup/cygwin/fhandler.cc
View File

@ -84,7 +84,7 @@ fhandler_base::eat_readahead (int n)
n = ralen; n = ralen;
if (n > 0 && ralen) if (n > 0 && ralen)
{ {
if ((ralen -= n) < 0) if ((int) (ralen -= n) < 0)
ralen = 0; ralen = 0;
if (raixget >= ralen) if (raixget >= ralen)
@ -1059,14 +1059,14 @@ fhandler_base::dup (fhandler_base *child)
/* Base terminal handlers. These just return errors. */ /* Base terminal handlers. These just return errors. */
int int
fhandler_base::tcflush (int queue) fhandler_base::tcflush (int)
{ {
set_errno (ENOTTY); set_errno (ENOTTY);
return -1; return -1;
} }
int int
fhandler_base::tcsendbreak (int duration) fhandler_base::tcsendbreak (int)
{ {
set_errno (ENOTTY); set_errno (ENOTTY);
return -1; return -1;
@ -1080,28 +1080,28 @@ fhandler_base::tcdrain (void)
} }
int int
fhandler_base::tcflow (int action) fhandler_base::tcflow (int)
{ {
set_errno (ENOTTY); set_errno (ENOTTY);
return -1; return -1;
} }
int int
fhandler_base::tcsetattr (int a, const struct termios *t) fhandler_base::tcsetattr (int, const struct termios *)
{ {
set_errno (ENOTTY); set_errno (ENOTTY);
return -1; return -1;
} }
int int
fhandler_base::tcgetattr (struct termios *t) fhandler_base::tcgetattr (struct termios *)
{ {
set_errno (ENOTTY); set_errno (ENOTTY);
return -1; return -1;
} }
int int
fhandler_base::tcsetpgrp (const pid_t pid) fhandler_base::tcsetpgrp (const pid_t)
{ {
set_errno (ENOTTY); set_errno (ENOTTY);
return -1; return -1;
@ -1293,7 +1293,7 @@ fhandler_disk_file::lock (int cmd, struct flock *fl)
startpos = 0; startpos = 0;
break; break;
case SEEK_CUR: case SEEK_CUR:
if ((startpos = lseek (0, SEEK_CUR)) < 0) if ((off_t) (startpos = lseek (0, SEEK_CUR)) == (off_t)-1)
return -1; return -1;
break; break;
case SEEK_END: case SEEK_END:
@ -1453,7 +1453,7 @@ fhandler_pipe::lseek (off_t offset, int whence)
} }
void __stdcall void __stdcall
set_inheritance (HANDLE &h, int not_inheriting, const char *name) set_inheritance (HANDLE &h, int not_inheriting, const char *)
{ {
HANDLE newh; HANDLE newh;

16
winsup/cygwin/fhandler.h
View File

@ -295,7 +295,7 @@ public:
{ {
return windows_device_names[FHDEVN (status)]; return windows_device_names[FHDEVN (status)];
} }
virtual int bg_check (int, int x = 0) {return 1;} virtual int bg_check (int) {return 1;}
}; };
class fhandler_socket: public fhandler_base class fhandler_socket: public fhandler_base
@ -311,7 +311,7 @@ public:
int write (const void *ptr, size_t len); int write (const void *ptr, size_t len);
int read (void *ptr, size_t len); int read (void *ptr, size_t len);
int ioctl (unsigned int cmd, void *); int ioctl (unsigned int cmd, void *);
off_t lseek (off_t offset, int whence) { return 0; } off_t lseek (off_t, int) { return 0; }
int close (); int close ();
select_record *select_read (select_record *s); select_record *select_read (select_record *s);
@ -479,7 +479,7 @@ public:
int tcflow (int); int tcflow (int);
int tcsetattr (int a, const struct termios *t); int tcsetattr (int a, const struct termios *t);
int tcgetattr (struct termios *t); int tcgetattr (struct termios *t);
off_t lseek (off_t offset, int whence) { return 0; } off_t lseek (off_t, int) { return 0; }
int tcflush (int); int tcflush (int);
void dump (); void dump ();
int is_tty () { return 1; } int is_tty () { return 1; }
@ -501,7 +501,7 @@ class fhandler_termios: public fhandler_base
{ {
protected: protected:
HANDLE output_handle; HANDLE output_handle;
virtual void doecho (const void *str, DWORD len) {}; virtual void doecho (const void *, DWORD) {};
virtual int accept_input () {return 1;}; virtual int accept_input () {return 1;};
public: public:
tty_min *tc; tty_min *tc;
@ -519,7 +519,7 @@ public:
int tcgetpgrp (); int tcgetpgrp ();
int tcsetpgrp (int pid); int tcsetpgrp (int pid);
void set_ctty (int ttynum, int flags); void set_ctty (int ttynum, int flags);
int bg_check (int sig, int blocksigs = 1); int bg_check (int sig);
}; };
/* This is a input and output console handle */ /* This is a input and output console handle */
@ -656,7 +656,7 @@ public:
int tcflush (int); int tcflush (int);
int ioctl (unsigned int cmd, void *); int ioctl (unsigned int cmd, void *);
off_t lseek (off_t offset, int whence) { return 0; } off_t lseek (off_t, int) { return 0; }
}; };
class fhandler_pty_master: public fhandler_tty_common class fhandler_pty_master: public fhandler_tty_common
@ -681,7 +681,7 @@ public:
int tcflush (int); int tcflush (int);
int ioctl (unsigned int cmd, void *); int ioctl (unsigned int cmd, void *);
off_t lseek (off_t offset, int whence) { return 0; } off_t lseek (off_t, int) { return 0; }
char *ptsname (); char *ptsname ();
void set_close_on_exec (int val); void set_close_on_exec (int val);
@ -739,7 +739,7 @@ public:
int write (const void *ptr, size_t len); int write (const void *ptr, size_t len);
int read (void *ptr, size_t len); int read (void *ptr, size_t len);
int ioctl (unsigned int cmd, void *); int ioctl (unsigned int cmd, void *);
off_t lseek (off_t offset, int whence) { return 0; } off_t lseek (off_t, int) { return 0; }
int close (void) { return 0; } int close (void) { return 0; }
void set_close_on_exec (int val); void set_close_on_exec (int val);

4
winsup/cygwin/fhandler_console.cc
View File

@ -407,7 +407,7 @@ fhandler_console::ioctl (unsigned int cmd, void *buf)
} }
return 0; return 0;
case TIOCSWINSZ: case TIOCSWINSZ:
(void) bg_check (SIGTTOU, 0); (void) bg_check (SIGTTOU);
return 0; return 0;
} }
@ -1323,7 +1323,7 @@ fhandler_console::set_close_on_exec (int val)
} }
void void
fhandler_console::fixup_after_fork (HANDLE parent) fhandler_console::fixup_after_fork (HANDLE)
{ {
HANDLE h = get_handle (); HANDLE h = get_handle ();
HANDLE oh = get_output_handle (); HANDLE oh = get_output_handle ();

2
winsup/cygwin/fhandler_floppy.cc
View File

@ -28,7 +28,7 @@ fhandler_dev_floppy::is_eom (int win_error)
} }
int int
fhandler_dev_floppy::is_eof (int win_error) fhandler_dev_floppy::is_eof (int)
{ {
int ret = 0; int ret = 0;
if (ret) if (ret)

2
winsup/cygwin/fhandler_termios.cc
View File

@ -102,7 +102,7 @@ fhandler_termios::set_ctty (int ttynum, int flags)
} }
int int
fhandler_termios::bg_check (int sig, int blocksigs) fhandler_termios::bg_check (int sig)
{ {
if (!myself->pgid || tc->getpgid () == myself->pgid || if (!myself->pgid || tc->getpgid () == myself->pgid ||
myself->ctty != tc->ntty || myself->ctty != tc->ntty ||

28
winsup/cygwin/fhandler_tty.cc
View File

@ -182,7 +182,7 @@ fhandler_pty_master::accept_input ()
} }
static DWORD WINAPI static DWORD WINAPI
process_input (void *arg) process_input (void *)
{ {
char rawbuf[INP_BUFFER_SIZE]; char rawbuf[INP_BUFFER_SIZE];
@ -346,7 +346,7 @@ again:
} }
static DWORD WINAPI static DWORD WINAPI
process_output (void *arg) process_output (void *)
{ {
char buf[OUT_BUFFER_SIZE*2]; char buf[OUT_BUFFER_SIZE*2];
int n; int n;
@ -374,7 +374,7 @@ process_output (void *arg)
/* Process tty ioctl requests */ /* Process tty ioctl requests */
static DWORD WINAPI static DWORD WINAPI
process_ioctl (void *arg) process_ioctl (void *)
{ {
while (1) while (1)
{ {
@ -500,7 +500,7 @@ fhandler_tty_slave::open (const char *, int flags, mode_t)
} }
void void
fhandler_tty_slave::init (HANDLE f, DWORD a, mode_t) fhandler_tty_slave::init (HANDLE, DWORD a, mode_t)
{ {
int mode = 0; int mode = 0;
@ -733,7 +733,7 @@ fhandler_tty_slave::tcgetattr (struct termios *t)
} }
int int
fhandler_tty_slave::tcsetattr (int a, const struct termios *t) fhandler_tty_slave::tcsetattr (int, const struct termios *t)
{ {
acquire_output_mutex (INFINITE); acquire_output_mutex (INFINITE);
get_ttyp ()->ti = *t; get_ttyp ()->ti = *t;
@ -742,7 +742,7 @@ fhandler_tty_slave::tcsetattr (int a, const struct termios *t)
} }
int int
fhandler_tty_slave::tcflush (int a) fhandler_tty_slave::tcflush (int)
{ {
return 0; return 0;
} }
@ -916,14 +916,16 @@ fhandler_pty_master::read (void *ptr, size_t len)
*cptr++ = TIOCPKT_DATA; *cptr++ = TIOCPKT_DATA;
len--; len--;
} }
n = process_slave_output (cptr, len);
if (n < 0) int x;
x = process_slave_output (cptr, len);
if (x < 0)
return -1; return -1;
if (output_done_event != NULL) if (output_done_event != NULL)
SetEvent (output_done_event); SetEvent (output_done_event);
if (pktmode && n > 0) if (pktmode && x > 0)
n++; x++;
return n; return x;
} }
int int
@ -934,14 +936,14 @@ fhandler_pty_master::tcgetattr (struct termios *t)
} }
int int
fhandler_pty_master::tcsetattr (int a, const struct termios *t) fhandler_pty_master::tcsetattr (int, const struct termios *t)
{ {
cygwin_shared->tty[ttynum]->ti = *t; cygwin_shared->tty[ttynum]->ti = *t;
return 0; return 0;
} }
int int
fhandler_pty_master::tcflush (int a) fhandler_pty_master::tcflush (int)
{ {
return 0; return 0;
} }

6
winsup/cygwin/fhandler_zero.cc
View File

@ -20,14 +20,14 @@ fhandler_dev_zero::fhandler_dev_zero (const char *name)
} }
int int
fhandler_dev_zero::open (const char *path, int flags, mode_t mode = 0) fhandler_dev_zero::open (const char *, int flags, mode_t)
{ {
set_flags (flags); set_flags (flags);
return 1; return 1;
} }
int int
fhandler_dev_zero::write (const void *ptr, size_t len) fhandler_dev_zero::write (const void *, size_t len)
{ {
return len; return len;
} }
@ -40,7 +40,7 @@ fhandler_dev_zero::read (void *ptr, size_t len)
} }
off_t off_t
fhandler_dev_zero::lseek (off_t offset, int whence) fhandler_dev_zero::lseek (off_t, int)
{ {
return 0; return 0;
} }

7
winsup/cygwin/fork.cc
View File

@ -169,8 +169,7 @@ sync_with_child (PROCESS_INFORMATION &pi, HANDLE subproc_ready,
} }
static int static int
resume_child (PROCESS_INFORMATION &pi, HANDLE subproc_ready, resume_child (PROCESS_INFORMATION &pi, HANDLE forker_finished)
HANDLE forker_finished)
{ {
int rc; int rc;
@ -454,7 +453,7 @@ fork ()
DllList::the().numberOfOpenedDlls(); DllList::the().numberOfOpenedDlls();
/* Start thread, and wait for it to reload dlls. */ /* Start thread, and wait for it to reload dlls. */
if (!resume_child (pi, subproc_ready, forker_finished) || if (!resume_child (pi, forker_finished) ||
!sync_with_child (pi, subproc_ready, load_dll, "child loading dlls")) !sync_with_child (pi, subproc_ready, load_dll, "child loading dlls"))
goto cleanup; goto cleanup;
@ -473,7 +472,7 @@ fork ()
} }
DLL_DONE; DLL_DONE;
/* Start the child up again. */ /* Start the child up again. */
(void) resume_child (pi, subproc_ready, forker_finished); (void) resume_child (pi, forker_finished);
} }
ForceCloseHandle (subproc_ready); ForceCloseHandle (subproc_ready);

2
winsup/cygwin/grp.cc
View File

@ -277,7 +277,7 @@ getgroups (int gidsetsize, gid_t *grouplist)
extern "C" extern "C"
int int
initgroups (const char *user, gid_t grp) initgroups (const char *, gid_t)
{ {
return 0; return 0;
} }

2
winsup/cygwin/heap.cc
View File

@ -20,7 +20,7 @@ details. */
static unsigned page_const = 0; static unsigned page_const = 0;
static int __inline static __inline__ int
getpagesize(void) getpagesize(void)
{ {
SYSTEM_INFO si; SYSTEM_INFO si;

2
winsup/cygwin/init.cc
View File

@ -27,7 +27,7 @@ extern void do_global_ctors (void (**in_pfunc)(), int force);
int NO_COPY dynamically_loaded; int NO_COPY dynamically_loaded;
int int
WINAPI dll_entry (HANDLE hdll, DWORD reason, void *static_load) WINAPI dll_entry (HANDLE, DWORD reason, void *static_load)
{ {
switch (reason) switch (reason)
{ {

6
winsup/cygwin/localtime.c
View File

@ -1560,10 +1560,8 @@ tzset P((void))
/*ARGSUSED*/ /*ARGSUSED*/
static void static void
localsub(timep, offset, tmp) localsub (const time_t * const timep, const long offset,
const time_t * const timep; struct tm * const tmp)
const long offset;
struct tm * const tmp;
{ {
register struct state * sp; register struct state * sp;
register const struct ttinfo * ttisp; register const struct ttinfo * ttisp;

4
winsup/cygwin/malloc_wrapper.cc
View File

@ -224,14 +224,14 @@ malloc_init ()
extern "C" extern "C"
void void
__malloc_lock (struct _reent *ptr) __malloc_lock (struct _reent *)
{ {
SetResourceLock(LOCK_MEMORY_LIST,WRITE_LOCK|READ_LOCK," __malloc_lock"); SetResourceLock(LOCK_MEMORY_LIST,WRITE_LOCK|READ_LOCK," __malloc_lock");
} }
extern "C" extern "C"
void void
__malloc_unlock (struct _reent *ptr) __malloc_unlock (struct _reent *)
{ {
ReleaseResourceLock(LOCK_MEMORY_LIST,WRITE_LOCK|READ_LOCK," __malloc_unlock"); ReleaseResourceLock(LOCK_MEMORY_LIST,WRITE_LOCK|READ_LOCK," __malloc_unlock");
} }

2
winsup/cygwin/net.cc
View File

@ -904,7 +904,7 @@ cygwin_shutdown (int fd, int how)
/* exported as herror: standards? */ /* exported as herror: standards? */
extern "C" extern "C"
void void
cygwin_herror (const char *p) cygwin_herror (const char *)
{ {
debug_printf ("********%d*************", __LINE__); debug_printf ("********%d*************", __LINE__);
} }

26
winsup/cygwin/passwd.cc
View File

@ -164,8 +164,7 @@ search_for (uid_t uid, const char *name)
return default_pw; return default_pw;
} }
extern "C" extern "C" struct passwd *
struct passwd *
getpwuid (uid_t uid) getpwuid (uid_t uid)
{ {
if (!passwd_in_memory_p) if (!passwd_in_memory_p)
@ -174,8 +173,7 @@ getpwuid (uid_t uid)
return search_for (uid, 0); return search_for (uid, 0);
} }
extern "C" extern "C" struct passwd *
struct passwd *
getpwnam (const char *name) getpwnam (const char *name)
{ {
if (!passwd_in_memory_p) if (!passwd_in_memory_p)
@ -184,8 +182,7 @@ getpwnam (const char *name)
return search_for (0, name); return search_for (0, name);
} }
extern "C" extern "C" struct passwd *
struct passwd *
getpwent (void) getpwent (void)
{ {
if (!passwd_in_memory_p) if (!passwd_in_memory_p)
@ -197,9 +194,8 @@ getpwent (void)
return NULL; return NULL;
} }
extern "C" extern "C" struct passwd *
struct passwd * getpwduid (uid_t)
getpwduid (uid_t uid)
{ {
if (!passwd_in_memory_p) if (!passwd_in_memory_p)
read_etc_passwd(); read_etc_passwd();
@ -207,8 +203,7 @@ getpwduid (uid_t uid)
return NULL; return NULL;
} }
extern "C" extern "C" void
void
setpwent (void) setpwent (void)
{ {
if (!passwd_in_memory_p) if (!passwd_in_memory_p)
@ -217,8 +212,7 @@ setpwent (void)
pw_pos = 0; pw_pos = 0;
} }
extern "C" extern "C" void
void
endpwent (void) endpwent (void)
{ {
if (!passwd_in_memory_p) if (!passwd_in_memory_p)
@ -227,8 +221,7 @@ endpwent (void)
pw_pos = 0; pw_pos = 0;
} }
extern "C" extern "C" int
int
setpassent () setpassent ()
{ {
if (!passwd_in_memory_p) if (!passwd_in_memory_p)
@ -237,8 +230,7 @@ setpassent ()
return 0; return 0;
} }
extern "C" extern "C" char *
char *
getpass (const char * prompt) getpass (const char * prompt)
{ {
#ifdef _MT_SAFE #ifdef _MT_SAFE

2
winsup/cygwin/path.cc
View File

@ -2061,7 +2061,7 @@ has_suffix (const char *path, const suffix_info *suffixes)
return NULL; return NULL;
} }
static int __inline static __inline__ int
next_suffix (char *ext_here, const suffix_info *&suffixes) next_suffix (char *ext_here, const suffix_info *&suffixes)
{ {
if (!suffixes) if (!suffixes)

7
winsup/cygwin/path.h
View File

@ -27,6 +27,7 @@ enum symlink_follow
enum enum
{ {
PATH_NOTHING = 0,
PATH_SYMLINK = 1, PATH_SYMLINK = 1,
PATH_BINARY = MOUNT_BINARY, PATH_BINARY = MOUNT_BINARY,
PATH_EXEC = MOUNT_EXEC, PATH_EXEC = MOUNT_EXEC,
@ -51,8 +52,8 @@ class path_conv
void set_binary () {path_flags |= PATH_BINARY;} void set_binary () {path_flags |= PATH_BINARY;}
void set_symlink () {path_flags |= PATH_SYMLINK;} void set_symlink () {path_flags |= PATH_SYMLINK;}
void set_exec (int x = 1) {path_flags |= x ? PATH_EXEC : 0;} void set_exec (int x = 1) {path_flags |= x ? PATH_EXEC : PATH_NOTHING;}
void set_has_acls (int x = 1) {path_flags |= x ? PATH_HASACLS : 0;} void set_has_acls (int x = 1) {path_flags |= x ? PATH_HASACLS : PATH_NOTHING;}
char *known_suffix; char *known_suffix;
@ -66,7 +67,7 @@ class path_conv
int use_full_path = 0, const suffix_info *suffixes = NULL); int use_full_path = 0, const suffix_info *suffixes = NULL);
inline char *get_win32 () { return path; } inline char *get_win32 () { return path; }
BOOL is_device () {return devn != FH_BAD;} BOOL is_device () {return devn != FH_BAD;}
DWORD get_devn () {return devn == FH_BAD ? FH_DISK : devn;} DWORD get_devn () {return devn == FH_BAD ? (DWORD) FH_DISK : devn;}
short get_unitn () {return devn == FH_BAD ? 0 : unit;} short get_unitn () {return devn == FH_BAD ? 0 : unit;}
DWORD file_attributes () {return fileattr;} DWORD file_attributes () {return fileattr;}
}; };

2
winsup/cygwin/regexp/regexp.c
View File

@ -278,7 +278,7 @@ const char *exp;
longest = NULL; longest = NULL;
len = 0; len = 0;
for (; scan != NULL; scan = regnext(scan)) for (; scan != NULL; scan = regnext(scan))
if (OP(scan) == EXACTLY && strlen(OPERAND(scan)) >= len) { if (OP(scan) == EXACTLY && (int) strlen(OPERAND(scan)) >= len) {
longest = OPERAND(scan); longest = OPERAND(scan);
len = strlen(OPERAND(scan)); len = strlen(OPERAND(scan));
} }

4
winsup/cygwin/security.cc
View File

@ -1782,7 +1782,7 @@ int acecmp (const void *a1, const void *a2)
extern "C" extern "C"
int int
aclsort (int nentries, int calclass, aclent_t *aclbufp) aclsort (int nentries, int, aclent_t *aclbufp)
{ {
if (aclcheck (aclbufp, nentries, NULL)) if (aclcheck (aclbufp, nentries, NULL))
return -1; return -1;
@ -1975,7 +1975,7 @@ permfromstr (char *perm)
extern "C" extern "C"
aclent_t * aclent_t *
aclfromtext (char *acltextp, int *aclcnt) aclfromtext (char *acltextp, int *)
{ {
if (!acltextp) if (!acltextp)
{ {

11
winsup/cygwin/select.cc
View File

@ -371,8 +371,7 @@ set_bits (select_record *me, fd_set *readfds, fd_set *writefds,
} }
static int static int
verify_true (select_record *me, fd_set *readfds, fd_set *writefds, verify_true (select_record *, fd_set *, fd_set *, fd_set *)
fd_set *exceptfds)
{ {
return 1; return 1;
} }
@ -385,7 +384,7 @@ verify_ok (select_record *me, fd_set *readfds, fd_set *writefds,
} }
static int static int
no_startup (select_record *me, select_stuff *stuff) no_startup (select_record *, select_stuff *)
{ {
return 1; return 1;
} }
@ -522,7 +521,7 @@ start_thread_pipe (select_record *me, select_stuff *stuff)
} }
static void static void
pipe_cleanup (select_record *me, select_stuff *stuff) pipe_cleanup (select_record *, select_stuff *stuff)
{ {
pipeinf *pi = (pipeinf *)stuff->device_specific[FHDEVN(FH_PIPE)]; pipeinf *pi = (pipeinf *)stuff->device_specific[FHDEVN(FH_PIPE)];
if (pi && pi->thread) if (pi && pi->thread)
@ -902,7 +901,7 @@ start_thread_serial (select_record *me, select_stuff *stuff)
} }
static void static void
serial_cleanup (select_record *me, select_stuff *stuff) serial_cleanup (select_record *, select_stuff *stuff)
{ {
serialinf *si = (serialinf *)stuff->device_specific[FHDEVN(FH_SERIAL)]; serialinf *si = (serialinf *)stuff->device_specific[FHDEVN(FH_SERIAL)];
if (si && si->thread) if (si && si->thread)
@ -1225,7 +1224,7 @@ err:
} }
void void
socket_cleanup (select_record *me, select_stuff *stuff) socket_cleanup (select_record *, select_stuff *stuff)
{ {
socketinf *si = (socketinf *)stuff->device_specific[FHDEVN(FH_SOCKET)]; socketinf *si = (socketinf *)stuff->device_specific[FHDEVN(FH_SOCKET)];
select_printf ("si %p si->thread %p", si, si ? si->thread : NULL); select_printf ("si %p si->thread %p", si, si ? si->thread : NULL);

10
winsup/cygwin/shared.h
View File

@ -530,12 +530,13 @@ extern int __stdcall set_console_state_for_spawn ();
void __stdcall shared_init (void); void __stdcall shared_init (void);
void __stdcall shared_terminate (void); void __stdcall shared_terminate (void);
/* This is for programs that want to access the shared data. */
extern "C" class shared_info *cygwin_getshared (void);
char *__stdcall shared_name (const char *, int); char *__stdcall shared_name (const char *, int);
void *__stdcall open_shared (const char *name, HANDLE &shared_h, DWORD size, void *addr); void *__stdcall open_shared (const char *name, HANDLE &shared_h, DWORD size, void *addr);
extern "C" {
/* This is for programs that want to access the shared data. */
class shared_info *cygwin_getshared (void);
struct cygwin_version_info struct cygwin_version_info
{ {
unsigned short api_major; unsigned short api_major;
@ -545,8 +546,9 @@ struct cygwin_version_info
unsigned short shared_data; unsigned short shared_data;
unsigned short mount_registry; unsigned short mount_registry;
const char *dll_build_date; const char *dll_build_date;
const char shared_id[sizeof (CYGWIN_VERSION_DLL_IDENTIFIER) + 64]; char shared_id[sizeof (CYGWIN_VERSION_DLL_IDENTIFIER) + 64];
}; };
}
extern cygwin_version_info cygwin_version; extern cygwin_version_info cygwin_version;
extern const char *cygwin_version_strings; extern const char *cygwin_version_strings;

8
winsup/cygwin/sigproc.cc
View File

@ -108,7 +108,7 @@ int NO_COPY pending_signals = 0; // TRUE if signals pending
/* Functions /* Functions
*/ */
static int __stdcall checkstate (waitq *); static int __stdcall checkstate (waitq *);
static BOOL __inline get_proc_lock (DWORD, DWORD); static __inline__ BOOL get_proc_lock (DWORD, DWORD);
static HANDLE __stdcall getsem (pinfo *, const char *, int, int); static HANDLE __stdcall getsem (pinfo *, const char *, int, int);
static void __stdcall remove_child (int); static void __stdcall remove_child (int);
static void __stdcall remove_zombie (int); static void __stdcall remove_zombie (int);
@ -992,7 +992,7 @@ getsem (pinfo *p, const char *str, int init, int max)
* Attempt to handle case where process is exiting as we try to grab * Attempt to handle case where process is exiting as we try to grab
* the mutex. * the mutex.
*/ */
static BOOL __inline static __inline__ BOOL
get_proc_lock (DWORD what, DWORD val) get_proc_lock (DWORD what, DWORD val)
{ {
Static int lastwhat = -1; Static int lastwhat = -1;
@ -1123,7 +1123,7 @@ stopped_or_terminated (waitq *parent_w, pinfo *child)
* has been handled, as per POSIX. * has been handled, as per POSIX.
*/ */
static DWORD WINAPI static DWORD WINAPI
wait_sig (VOID *arg) wait_sig (VOID *)
{ {
/* Initialization */ /* Initialization */
(void) SetThreadPriority (hwait_sig, WAIT_SIG_PRIORITY); (void) SetThreadPriority (hwait_sig, WAIT_SIG_PRIORITY);
@ -1292,7 +1292,7 @@ wait_sig (VOID *arg)
/* Wait for subprocesses to terminate. Executes in a separate thread. */ /* Wait for subprocesses to terminate. Executes in a separate thread. */
static DWORD WINAPI static DWORD WINAPI
wait_subproc (VOID *arg) wait_subproc (VOID *)
{ {
sip_printf ("starting"); sip_printf ("starting");
int errloop = 0; int errloop = 0;

2
winsup/cygwin/strace.cc
View File

@ -183,7 +183,7 @@ strace_printf (unsigned category, const char *fmt,...)
} }
void __stdcall void __stdcall
mark (const char *fn, int i) mark (const char *, int)
{ {
} }

4
winsup/cygwin/sync.h
View File

@ -21,8 +21,8 @@ class muto
DWORD tid; /* Thread Id of lock owner. */ DWORD tid; /* Thread Id of lock owner. */
public: public:
void *operator new (size_t, void *p) {return p;} void *operator new (size_t, void *p) {return p;}
void *operator new (size_t n) {return ::new muto; } void *operator new (size_t) {return ::new muto; }
void operator delete (void *p) {;} /* can't handle allocated mutos void operator delete (void *) {;} /* can't handle allocated mutos
currently */ currently */
/* This simple constructor is used for cases where no bruteforce /* This simple constructor is used for cases where no bruteforce

10
winsup/cygwin/syscalls.cc
View File

@ -149,7 +149,7 @@ setsid (void)
} }
static int static int
read_handler (int fd, void *ptr, size_t len, int blocksigs) read_handler (int fd, void *ptr, size_t len)
{ {
int res; int res;
fhandler_base *fh = dtable[fd]; fhandler_base *fh = dtable[fd];
@ -169,7 +169,7 @@ read_handler (int fd, void *ptr, size_t len, int blocksigs)
/* Check to see if this is a background read from a "tty", /* Check to see if this is a background read from a "tty",
sending a SIGTTIN, if appropriate */ sending a SIGTTIN, if appropriate */
res = fh->bg_check (SIGTTIN, blocksigs); res = fh->bg_check (SIGTTIN);
if (res > 0) if (res > 0)
{ {
myself->process_state |= PID_TTYIN; myself->process_state |= PID_TTYIN;
@ -198,11 +198,11 @@ _read (int fd, void *ptr, size_t len)
fh->get_r_no_interrupt ()) fh->get_r_no_interrupt ())
{ {
debug_printf ("non-interruptible read\n"); debug_printf ("non-interruptible read\n");
return read_handler (fd, ptr, len, 0); return read_handler (fd, ptr, len);
} }
if (fh->ready_for_read (fd, INFINITE, 0)) if (fh->ready_for_read (fd, INFINITE, 0))
return read_handler (fd, ptr, len, 1); return read_handler (fd, ptr, len);
set_sig_errno (EINTR); set_sig_errno (EINTR);
syscall_printf ("%d = read (%d<%s>, %p, %d), errno %d", -1, fd, fh->get_name (), syscall_printf ("%d = read (%d<%s>, %p, %d), errno %d", -1, fd, fh->get_name (),
@ -232,7 +232,7 @@ _write (int fd, const void *ptr, size_t len)
fhandler_base *fh; fhandler_base *fh;
fh = dtable[fd]; fh = dtable[fd];
res = fh->bg_check (SIGTTOU, 0); res = fh->bg_check (SIGTTOU);
if (res > 0) if (res > 0)
{ {
myself->process_state |= PID_TTYOU; myself->process_state |= PID_TTYOU;

2
winsup/cygwin/window.cc
View File

@ -63,7 +63,7 @@ WndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
static HANDLE window_started; static HANDLE window_started;
static DWORD WINAPI static DWORD WINAPI
Winmain (VOID *arg) Winmain (VOID *)
{ {
MSG msg; MSG msg;
WNDCLASS wc; WNDCLASS wc;