CVS update: /ccvs/windows-NT/
[email protected] 31 May 2005 06:40:01 -0000
| Newsgroups | gmane.comp.version-control.cvs.cvs |
|---|---|
| Message-ID | <[email protected]> |
User: conradpino Date: 05/05/30 23:40:01 Modified: /ccvs/windows-NT/ ChangeLog, woe32.c, woe32.h Log: * woe32.c, woe32.h: Move functions into alpabetical order. File Changes: Directory: /ccvs/windows-NT/ ============================ File [changed]: ChangeLog Url: https://ccvs.cvshome.org/source/browse/ccvs/windows-NT/ChangeLog?r1=1.312&r2=1.313 Delta lines: +4 -0 ------------------- --- ChangeLog 31 May 2005 04:13:19 -0000 1.312 +++ ChangeLog 31 May 2005 06:39:59 -0000 1.313 @@ -1,5 +1,9 @@ 2005-05-30 Conrad T. Pino <[email protected]> + * woe32.c, woe32.h: Move functions into alpabetical order. + +2005-05-30 Conrad T. Pino <[email protected]> + * woe32.c: Remove function (getpass,getpid,sleep) implementations. * unistd.c: Add function (getpass,getpid,sleep) implementations. File [changed]: woe32.c Url: https://ccvs.cvshome.org/source/browse/ccvs/windows-NT/woe32.c?r1=1.7&r2=1.8 Delta lines: +29 -29 --------------------- --- woe32.c 31 May 2005 04:13:19 -0000 1.7 +++ woe32.c 31 May 2005 06:39:59 -0000 1.8 @@ -18,21 +18,6 @@ -/* #define SYSTEM_INITIALIZE(pargc,pargv) woe32_init_winsock() */ -void -woe32_init_winsock (void) -{ - WSADATA data; - - if (WSAStartup (MAKEWORD (1, 1), &data)) - { - fprintf (stderr, "cvs: unable to initialize winsock\n"); - exit (1); - } -} - - - /* #define SYSTEM_CLEANUP woe32_cleanup */ void woe32_cleanup (void) @@ -55,6 +40,35 @@ +char * +woe32_getlogin (void) +{ + static char name[256]; + DWORD dw = sizeof (name); + GetUserName (name, &dw); + if (name[0] == '\0') + return NULL; + else + return name; +} + + + +/* #define SYSTEM_INITIALIZE(pargc,pargv) woe32_init_winsock() */ +void +woe32_init_winsock (void) +{ + WSADATA data; + + if (WSAStartup (MAKEWORD (1, 1), &data)) + { + fprintf (stderr, "cvs: unable to initialize winsock\n"); + exit (1); + } +} + + + /* * Sleep at least some number of microseconds, specified with nanosecond * resolution and rounding up to the nearest microsecond. @@ -78,17 +92,3 @@ { return my_usleep (requested_delay); } - - - -char * -woe32_getlogin (void) -{ - static char name[256]; - DWORD dw = sizeof (name); - GetUserName (name, &dw); - if (name[0] == '\0') - return NULL; - else - return name; -} File [changed]: woe32.h Url: https://ccvs.cvshome.org/source/browse/ccvs/windows-NT/woe32.h?r1=1.1&r2=1.2 Delta lines: +5 -5 ------------------- --- woe32.h 31 May 2005 02:09:42 -0000 1.1 +++ woe32.h 31 May 2005 06:39:59 -0000 1.2 @@ -9,16 +9,16 @@ #include <timespec.h> -/* #define SYSTEM_INITIALIZE(pargc,pargv) woe32_init_winsock() */ -void woe32_init_winsock (void); - /* #define SYSTEM_CLEANUP woe32_cleanup */ void woe32_cleanup (void); +char *woe32_getlogin (void); + +/* #define SYSTEM_INITIALIZE(pargc,pargv) woe32_init_winsock() */ +void woe32_init_winsock (void); + /* #define nanosleep woe32_nanosleep */ int woe32_nanosleep (const struct timespec *requested_delay, struct timespec *remaining_delay); -char *woe32_getlogin (void); - #endif /* WOE32_H */