diff options
author | Christopher Faylor <me@cgf.cx> | 2008-02-15 17:53:11 +0000 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2008-02-15 17:53:11 +0000 |
commit | 70300fdb1c4f0834f83441fcd3fa029e110a7c2e (patch) | |
tree | 79601b6862fc095dc64f3093f732f2608acdfc9f /winsup/cygwin/strfuncs.cc | |
parent | d0399780691190935aa55a4131f732c01f2ea7df (diff) | |
download | cygnal-70300fdb1c4f0834f83441fcd3fa029e110a7c2e.tar.gz cygnal-70300fdb1c4f0834f83441fcd3fa029e110a7c2e.tar.bz2 cygnal-70300fdb1c4f0834f83441fcd3fa029e110a7c2e.zip |
Perform whitespace cleanup throughout.
* dcrt0.cc (signal_shift_subtract): Eliminate ancient backwards compatibility.
(check_sanity_and_sync): Ditto.
* winsup.h (SIGTOMASK): Ditto. Just use constant in signal calculation.
* include/cygwin/version: Remove backwards signal mask compatibility define.
* path.cc (symlink_info::check_sysfile): Cosmetic change.
* registry.cc (get_registry_hive_path): Remove unneeded variable.
* exceptions.cc (handle_sigsuspend): Eliminate thread signal mask and use
either main sigmask or current thread sigmask.
(set_process_mask): Ditto.
(sighold): Ditto.
(sigrelse): Ditto.
(sigset): Ditto.
(set_process_mask_delta): Ditto.
(_cygtls::call_signal_handler): Ditto.
* fhandler_process.cc (format_process_status): Ditto.
* fhandler_termios.cc (fhandler_termios::bg_check): Ditto.
* pinfo.h (class pinfo): Ditto.
* select.cc (pselect): Ditto.
* signal.cc (sigprocmask): Ditto.
(abort): Ditto.
(sigpause): Ditto.
(sigsend): Ditto.
(wait_sig): Ditto.
* thread.h (pthread::parent_tls): New member.
* thread.cc (pthread::pthread): Record parent_tls here.
(pthread::thread_init_wrapper): Initialize sigmask from parent thread.
Diffstat (limited to 'winsup/cygwin/strfuncs.cc')
-rw-r--r-- | winsup/cygwin/strfuncs.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/winsup/cygwin/strfuncs.cc b/winsup/cygwin/strfuncs.cc index 6b1250c3a..e3d7a6c0f 100644 --- a/winsup/cygwin/strfuncs.cc +++ b/winsup/cygwin/strfuncs.cc @@ -55,9 +55,9 @@ sys_wcstombs (char *tgt, int tlen, const PWCHAR src, int slen) The "type" argument determines where the resulting buffer is stored. It's either one of the cygheap_types values, or it's "HEAP_NOTHEAP". In the latter case the allocation uses simple calloc. - + Note that this code is shared by cygserver (which requires it via - __small_vsprintf) and so when built there plain calloc is the + __small_vsprintf) and so when built there plain calloc is the only choice. */ int __stdcall sys_wcstombs_alloc (char **tgt_p, int type, const PWCHAR src, int slen) @@ -70,11 +70,11 @@ sys_wcstombs_alloc (char **tgt_p, int type, const PWCHAR src, int slen) size_t tlen = (slen == -1 ? ret : ret + 1); if (type == HEAP_NOTHEAP) - *tgt_p = (char *) calloc (tlen, sizeof (char)); + *tgt_p = (char *) calloc (tlen, sizeof (char)); else - *tgt_p = (char *) ccalloc ((cygheap_types) type, tlen, sizeof (char)); + *tgt_p = (char *) ccalloc ((cygheap_types) type, tlen, sizeof (char)); if (!*tgt_p) - return 0; + return 0; ret = sys_wcstombs (*tgt_p, tlen, src, slen); } return ret; @@ -97,11 +97,11 @@ sys_mbstowcs_alloc (PWCHAR *tgt_p, int type, const char *src) if (ret) { if (type == HEAP_NOTHEAP) - *tgt_p = (PWCHAR) calloc (ret, sizeof (WCHAR)); + *tgt_p = (PWCHAR) calloc (ret, sizeof (WCHAR)); else - *tgt_p = (PWCHAR) ccalloc ((cygheap_types) type, ret, sizeof (WCHAR)); + *tgt_p = (PWCHAR) ccalloc ((cygheap_types) type, ret, sizeof (WCHAR)); if (!*tgt_p) - return 0; + return 0; ret = sys_mbstowcs (*tgt_p, src, ret); } return ret; |