diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2003-05-21 08:01:57 +0000 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2003-05-21 08:01:57 +0000 |
commit | 5c768c978c52c277536c28925161148407206d63 (patch) | |
tree | 9cd32501cc344c4fb8d1343313c3021e4adc63be /winsup/cygwin/shared.cc | |
parent | 3a9c82d0117666ddb0c140389d05d057db3fad0c (diff) | |
download | cygnal-5c768c978c52c277536c28925161148407206d63.tar.gz cygnal-5c768c978c52c277536c28925161148407206d63.tar.bz2 cygnal-5c768c978c52c277536c28925161148407206d63.zip |
* shared_info.h: Match shared_name declaration with below change.
* shared.cc (shared_name): Use incoming char * parameter instead of
local static buffer.
(open_shared): Accomodate new calling convention for shared_name.
* exceptions.cc (events_init): Ditto.
* sigproc.cc (getsem): Ditto.
* syscalls.cc (login): Ditto.
(logout): Ditto.
(pututline): Ditto.
Diffstat (limited to 'winsup/cygwin/shared.cc')
-rw-r--r-- | winsup/cygwin/shared.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/winsup/cygwin/shared.cc b/winsup/cygwin/shared.cc index 2a6ae9087..c8c764c74 100644 --- a/winsup/cygwin/shared.cc +++ b/winsup/cygwin/shared.cc @@ -33,17 +33,16 @@ mount_info NO_COPY *mount_table; HANDLE NO_COPY cygwin_mount_h; char * __stdcall -shared_name (const char *str, int num) +shared_name (char *ret_buf, const char *str, int num) { - static NO_COPY char buf[MAX_PATH] = {0}; extern bool _cygwin_testing; - __small_sprintf (buf, "%s%s.%s.%d", + __small_sprintf (ret_buf, "%s%s.%s.%d", wincap.has_terminal_services () ? "Global\\" : "", cygwin_version.shared_id, str, num); if (_cygwin_testing) - strcat (buf, cygwin_version.dll_build_date); - return buf; + strcat (ret_buf, cygwin_version.dll_build_date); + return ret_buf; } #define page_const (65535) @@ -88,11 +87,12 @@ open_shared (const char *name, int n, HANDLE &shared_h, DWORD size, shared_locat if (!shared_h) { char *mapname; + char map_buf[MAX_PATH]; if (!name) mapname = NULL; else { - mapname = shared_name (name, n); + mapname = shared_name (map_buf, name, n); shared_h = OpenFileMappingA (FILE_MAP_READ | FILE_MAP_WRITE, TRUE, mapname); } |