1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* win32/win32.c: remove unused functions and variables.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6434 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2004-06-09 03:47:08 +00:00
parent 768c36c93a
commit b1469c134c
1 changed files with 50 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
win32/win32.c
View File

@ -43,10 +43,6 @@
#undef close #undef close
#undef setsockopt #undef setsockopt
#ifndef bool
#define bool int
#endif
#ifdef _M_IX86 #ifdef _M_IX86
# define WIN95 1 # define WIN95 1
#else #else
@ -87,12 +83,10 @@
#define TO_SOCKET(x) _get_osfhandle(x) #define TO_SOCKET(x) _get_osfhandle(x)
bool NtSyncProcess = TRUE;
static struct ChildRecord *CreateChild(const char *, const char *, SECURITY_ATTRIBUTES *, HANDLE, HANDLE, HANDLE); static struct ChildRecord *CreateChild(const char *, const char *, SECURITY_ATTRIBUTES *, HANDLE, HANDLE, HANDLE);
static int make_cmdvector(const char *, char ***); static int make_cmdvector(const char *, char ***);
static bool has_redirection(const char *); static int has_redirection(const char *);
static void StartSockets (); static void StartSockets(void);
static DWORD wait_events(HANDLE event, DWORD timeout); static DWORD wait_events(HANDLE event, DWORD timeout);
#if !defined(__BORLANDC__) && !defined(_WIN32_WCE) #if !defined(__BORLANDC__) && !defined(_WIN32_WCE)
static int rb_w32_open_osfhandle(long osfhandle, int flags); static int rb_w32_open_osfhandle(long osfhandle, int flags);
@ -248,7 +242,8 @@ static struct {
/* interrupt stuff */ /* interrupt stuff */
static HANDLE interrupted_event; static HANDLE interrupted_event;
HANDLE GetCurrentThreadHandle(void) HANDLE
GetCurrentThreadHandle(void)
{ {
static HANDLE current_process_handle = NULL; static HANDLE current_process_handle = NULL;
HANDLE h; HANDLE h;
@ -388,7 +383,8 @@ NtInitialize(int *argc, char ***argv)
#endif #endif
} }
char *getlogin() char *
getlogin()
{ {
char buffer[200]; char buffer[200];
DWORD len = 200; DWORD len = 200;
@ -463,25 +459,6 @@ FindFreeChildSlot(void)
} }
int SafeFree(char **vec, int vecc)
{
// vec
// |
// V ^---------------------V
// +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
// | | | .... | NULL | | ..... |\0 | | ..... |\0 |...
// +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
// |- elements+1 -| ^ 1st element ^ 2nd element
char *p;
p = (char *)vec;
free(p);
return 0;
}
/* /*
ruby -lne 'BEGIN{$cmds = Hash.new(0); $mask = 1}' ruby -lne 'BEGIN{$cmds = Hash.new(0); $mask = 1}'
-e '$cmds[$_.downcase] |= $mask' -e '$mask <<= 1 if ARGF.eof' -e '$cmds[$_.downcase] |= $mask' -e '$mask <<= 1 if ARGF.eof'
@ -661,7 +638,8 @@ rb_w32_join_argv(char *cmd, char *const *argv)
} }
pid_t pid_t
rb_w32_pipe_exec(const char *cmd, const char *prog, int mode, FILE **fpr, FILE **fpw) rb_w32_pipe_exec(const char *cmd, const char *prog, int mode,
FILE **fpr, FILE **fpw)
{ {
struct ChildRecord* child; struct ChildRecord* child;
HANDLE hReadIn, hReadOut; HANDLE hReadIn, hReadOut;
@ -847,7 +825,8 @@ rb_w32_aspawn(int mode, const char *prog, char *const *argv)
} }
static struct ChildRecord * static struct ChildRecord *
CreateChild(const char *cmd, const char *prog, SECURITY_ATTRIBUTES *psa, HANDLE hInput, HANDLE hOutput, HANDLE hError) CreateChild(const char *cmd, const char *prog, SECURITY_ATTRIBUTES *psa,
HANDLE hInput, HANDLE hOutput, HANDLE hError)
{ {
BOOL fRet; BOOL fRet;
DWORD dwCreationFlags; DWORD dwCreationFlags;
@ -1048,7 +1027,7 @@ cmdglob(NtCmdLineElement *patt, NtCmdLineElement **tail)
// characters that require it to be executed by a command interpreter // characters that require it to be executed by a command interpreter
// //
static bool static int
has_redirection(const char *cmd) has_redirection(const char *cmd)
{ {
char quote = '\0'; char quote = '\0';
@ -1549,10 +1528,6 @@ rb_w32_closedir(DIR *dirp)
free(dirp); free(dirp);
} }
EXTERN_C void __cdecl _lock_fhandle(int);
EXTERN_C void __cdecl _unlock_fhandle(int);
EXTERN_C void __cdecl _unlock(int);
#if (defined _MT || defined __MSVCRT__) && !defined __BORLANDC__ #if (defined _MT || defined __MSVCRT__) && !defined __BORLANDC__
#define MSVCRT_THREADS #define MSVCRT_THREADS
#endif #endif
@ -1861,7 +1836,7 @@ extract_file_fd(fd_set *set, fd_set *fileset)
} }
long long
rb_w32_select (int nfds, fd_set *rd, fd_set *wr, fd_set *ex, rb_w32_select(int nfds, fd_set *rd, fd_set *wr, fd_set *ex,
struct timeval *timeout) struct timeval *timeout)
{ {
long r; long r;
@ -1916,7 +1891,7 @@ rb_w32_select (int nfds, fd_set *rd, fd_set *wr, fd_set *ex,
} }
static void static void
StartSockets () StartSockets(void)
{ {
WORD version; WORD version;
WSADATA retdata; WSADATA retdata;
@ -2355,10 +2330,10 @@ rb_w32_getservbyport (int port, char *proto)
// Networking stubs // Networking stubs
// //
void endhostent() {} void endhostent(void) {}
void endnetent() {} void endnetent(void) {}
void endprotoent() {} void endprotoent(void) {}
void endservent() {} void endservent(void) {}
struct netent *getnetent (void) {return (struct netent *) NULL;} struct netent *getnetent (void) {return (struct netent *) NULL;}
@ -2843,7 +2818,8 @@ rb_w32_times(struct tms *tmbuf)
#define yield_once() Sleep(0) #define yield_once() Sleep(0)
#define yield_until(condition) do yield_once(); while (!(condition)) #define yield_until(condition) do yield_once(); while (!(condition))
static DWORD wait_events(HANDLE event, DWORD timeout) static DWORD
wait_events(HANDLE event, DWORD timeout)
{ {
HANDLE events[2]; HANDLE events[2];
int count = 0; int count = 0;
@ -2864,7 +2840,8 @@ static DWORD wait_events(HANDLE event, DWORD timeout)
return ret; return ret;
} }
static CRITICAL_SECTION* system_state(void) static CRITICAL_SECTION *
system_state(void)
{ {
static int initialized = 0; static int initialized = 0;
static CRITICAL_SECTION syssect; static CRITICAL_SECTION syssect;
@ -2879,7 +2856,8 @@ static CRITICAL_SECTION* system_state(void)
static LONG flag_interrupt = -1; static LONG flag_interrupt = -1;
static volatile DWORD tlsi_interrupt = TLS_OUT_OF_INDEXES; static volatile DWORD tlsi_interrupt = TLS_OUT_OF_INDEXES;
void rb_w32_enter_critical(void) void
rb_w32_enter_critical(void)
{ {
if (IsWinNT()) { if (IsWinNT()) {
EnterCriticalSection(system_state()); EnterCriticalSection(system_state());
@ -2900,7 +2878,8 @@ void rb_w32_enter_critical(void)
} }
} }
void rb_w32_leave_critical(void) void
rb_w32_leave_critical(void)
{ {
if (IsWinNT()) { if (IsWinNT()) {
LeaveCriticalSection(system_state()); LeaveCriticalSection(system_state());
@ -2919,7 +2898,8 @@ struct handler_arg_t {
HANDLE handshake; HANDLE handshake;
}; };
static void rb_w32_call_handler(struct handler_arg_t* h) static void
rb_w32_call_handler(struct handler_arg_t* h)
{ {
int status; int status;
RUBY_CRITICAL(rb_protect((VALUE (*)(VALUE))h->handler, (VALUE)h->arg, &h->status); RUBY_CRITICAL(rb_protect((VALUE (*)(VALUE))h->handler, (VALUE)h->arg, &h->status);
@ -2932,9 +2912,8 @@ static void rb_w32_call_handler(struct handler_arg_t* h)
Sleep(INFINITE); /* safe on Win95? */ Sleep(INFINITE); /* safe on Win95? */
} }
static struct handler_arg_t* setup_handler(struct handler_arg_t *harg, static struct handler_arg_t *
int arg, setup_handler(struct handler_arg_t *harg, int arg, void (*handler)(int),
void (*handler)(int),
HANDLE handshake) HANDLE handshake)
{ {
harg->handler = handler; harg->handler = handler;
@ -2945,7 +2924,8 @@ static struct handler_arg_t* setup_handler(struct handler_arg_t *harg,
return harg; return harg;
} }
static void setup_call(CONTEXT* ctx, struct handler_arg_t *harg) static void
setup_call(CONTEXT* ctx, struct handler_arg_t *harg)
{ {
#ifdef _M_IX86 #ifdef _M_IX86
DWORD *esp = (DWORD *)ctx->Esp; DWORD *esp = (DWORD *)ctx->Esp;
@ -2960,7 +2940,8 @@ static void setup_call(CONTEXT* ctx, struct handler_arg_t *harg)
#endif #endif
} }
int rb_w32_main_context(int arg, void (*handler)(int)) int
rb_w32_main_context(int arg, void (*handler)(int))
{ {
static HANDLE interrupt_done = NULL; static HANDLE interrupt_done = NULL;
struct handler_arg_t harg; struct handler_arg_t harg;
@ -3021,7 +3002,8 @@ int rb_w32_main_context(int arg, void (*handler)(int))
return TRUE; return TRUE;
} }
int rb_w32_sleep(unsigned long msec) int
rb_w32_sleep(unsigned long msec)
{ {
DWORD ret; DWORD ret;
RUBY_CRITICAL(ret = wait_events(NULL, msec)); RUBY_CRITICAL(ret = wait_events(NULL, msec));
@ -3030,7 +3012,8 @@ int rb_w32_sleep(unsigned long msec)
return ret != WAIT_TIMEOUT; return ret != WAIT_TIMEOUT;
} }
static void catch_interrupt(void) static void
catch_interrupt(void)
{ {
yield_once(); yield_once();
RUBY_CRITICAL(wait_events(NULL, 0)); RUBY_CRITICAL(wait_events(NULL, 0));
@ -3038,7 +3021,8 @@ static void catch_interrupt(void)
} }
#undef fgetc #undef fgetc
int rb_w32_getc(FILE* stream) int
rb_w32_getc(FILE* stream)
{ {
int c, trap_immediate = rb_trap_immediate; int c, trap_immediate = rb_trap_immediate;
#ifndef _WIN32_WCE #ifndef _WIN32_WCE
@ -3062,7 +3046,8 @@ int rb_w32_getc(FILE* stream)
} }
#undef fputc #undef fputc
int rb_w32_putc(int c, FILE* stream) int
rb_w32_putc(int c, FILE* stream)
{ {
int trap_immediate = rb_trap_immediate; int trap_immediate = rb_trap_immediate;
#ifndef _WIN32_WCE #ifndef _WIN32_WCE
@ -3169,7 +3154,8 @@ rb_w32_asynchronize(asynchronous_func_t func, VALUE self,
return val; return val;
} }
char **rb_w32_get_environ(void) char **
rb_w32_get_environ(void)
{ {
char *envtop, *env; char *envtop, *env;
char **myenvtop, **myenv; char **myenvtop, **myenv;
@ -3202,7 +3188,8 @@ char **rb_w32_get_environ(void)
return myenvtop; return myenvtop;
} }
void rb_w32_free_environ(char **env) void
rb_w32_free_environ(char **env)
{ {
char **t = env; char **t = env;
@ -3210,7 +3197,8 @@ void rb_w32_free_environ(char **env)
free(env); free(env);
} }
pid_t rb_w32_getpid(void) pid_t
rb_w32_getpid(void)
{ {
pid_t pid; pid_t pid;