From: <ea...@us...> - 2003-08-01 13:56:14
|
Update of /cvsroot/mingw/msys/rt/src/winsup/cygwin/include/sys In directory sc8-pr-cvs1:/tmp/cvs-serv16433/include/sys Modified Files: Tag: msys-1_1_0 strace.h Log Message: * Makefile.in (DLL_NAME): Change to reflect version 1.1. (LIB_NAME): Ditto. * cygwin.din: Now producing msys-1.1.dll. * drct0.cc (dll_crt0_1): Rename isdirsep to IsDirMarker. Modify comment to reflect msys-1.1.dll. * dir.cc (opendir): Rename SLASH_P to IsDirMarker. (mkdir): Remove case clash coding. * dlfcn.cc (get_full_path_of_dll): Add debugging output. * environ.cc (pcheck_case): Remove. (check_case_init): Remove coding relative to pcheck_case. * fhandler.cc (get_default_fmode): Rename isdirsep to IsDirMarker. (fhandler_disk_file::open): Remove case clash coding. * fhandler_tty.cc: Add __LINE__ to strace.prntf throughout. * ismsys.cc (IsMsys): Add check for msys-1.1.dll. * path.cc: Remove case clash coding throughout. Rename SLASH_P and isdirsep to IsDirMarker throughout. (path_conv::check): Streamline. (mount_info::read_mounts2): Search for msys-1.1.dll. (suffix_scan::has): Remove use of goto. (suffix_scan::next): Add debugging output. (symlink_info::check): Ditto. * path.h (iscygexec): Use only IsMsys to determine value. (path_conv::check): Change opt default to 0. (path_conv::path_conv): Ditto. (path_conv::path_conv : path_flags): Use hex value 0xffffffff for fileattr default valoe. * pinfo.cc (set_myself): Add __LINE__ in strace.prntf. * shared.cc (shared_name): Search for msys-1.1.dll. * spawn.cc (find_exec): Add debugging output. (iscmd): Rename isdirsep to IsDirMarker. (spawn_guts): Add debugging output. * strace.cc: Identify __LINE__ in debugging output throughout. * syscalls.cc: Remove case clash coding throughout. Rename isdirsep to IsDirMarker throughout. * syslog.cc: Remove the use of the FIXME macro. GCC 3 isn't liking it in global space. * winsup.h (SLASH_P): Rename to IsDirMarker. (isdirsep): Remove. (isabspath): Rename isdirsep to IsDirMarker. include/sys/strace.h: Add line parameter to declarations throughout. Index: strace.h =================================================================== RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/include/sys/strace.h,v retrieving revision 1.2 retrieving revision 1.2.10.1 diff -C2 -d -r1.2 -r1.2.10.1 *** strace.h 4 Feb 2002 15:35:30 -0000 1.2 --- strace.h 1 Aug 2003 13:25:25 -0000 1.2.10.1 *************** *** 36,40 **** class strace { ! int vsprntf (char *buf, const char *func, const char *infmt, va_list ap); void write (unsigned category, const char *buf, int count); public: --- 36,40 ---- class strace { ! int vsprntf (char *buf, const char *func, int line, const char *infmt, va_list ap); void write (unsigned category, const char *buf, int count); public: *************** *** 45,50 **** int execing; strace() : version(1) {} ! void prntf (unsigned, const char *func, const char *, ...) /*__attribute__ ((regparm(3)))*/; ! void vprntf (unsigned, const char *func, const char *, va_list ap) /*__attribute__ ((regparm(3)))*/; void wm (int message, int word, int lon) __attribute__ ((regparm(3))); }; --- 45,50 ---- int execing; strace() : version(1) {} ! void prntf (unsigned, const char *func, int line, const char *, ...) /*__attribute__ ((regparm(3)))*/; ! void vprntf (unsigned, const char *func, int line, const char *, va_list ap) /*__attribute__ ((regparm(3)))*/; void wm (int message, int word, int lon) __attribute__ ((regparm(3))); }; *************** *** 91,95 **** void small_printf (const char *, ...); ! void strace_printf (unsigned, const char *func, const char *, ...); #ifdef __cplusplus --- 91,95 ---- void small_printf (const char *, ...); ! void strace_printf (unsigned, const char *func, int line, const char *, ...); #ifdef __cplusplus *************** *** 109,113 **** do { \ if ((c & _STRACE_SYSTEM) || strace.active) \ ! strace.prntf (c, __PRETTY_FUNCTION__, __VA_ARGS__); \ } \ while (0) --- 109,113 ---- do { \ if ((c & _STRACE_SYSTEM) || strace.active) \ ! strace.prntf (c, __PRETTY_FUNCTION__, __LINE__, __VA_ARGS__); \ } \ while (0) *************** *** 131,135 **** ((void) ({\ if ((_STRACE_ ## what & _STRACE_SYSTEM) || strace.active) \ ! strace.prntf(_STRACE_ ## what, __PRETTY_FUNCTION__, fmt, ## args); \ 0; \ })) --- 131,135 ---- ((void) ({\ if ((_STRACE_ ## what & _STRACE_SYSTEM) || strace.active) \ ! strace.prntf(_STRACE_ ## what, __PRETTY_FUNCTION__, __LINE__, fmt, ## args); \ 0; \ })) *************** *** 137,141 **** ((void) ({\ if ((_STRACE_ ## what & _STRACE_SYSTEM) || strace.active) \ ! strace.prntf((_STRACE_ ## what) | _STRACE_NOTALL, __PRETTY_FUNCTION__, fmt, ## args); \ 0; \ })) --- 137,141 ---- ((void) ({\ if ((_STRACE_ ## what & _STRACE_SYSTEM) || strace.active) \ ! strace.prntf((_STRACE_ ## what) | _STRACE_NOTALL, __PRETTY_FUNCTION__,__LINE__, fmt, ## args); \ 0; \ })) |