diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2011-04-23 17:15:46 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2011-04-23 17:15:46 +0400 |
| commit | cca89be9ade65eacde6be3da6f93c06b3ed585b6 (patch) | |
| tree | 2369b16cecf252c8eb39ce535fdb811ebd301ca2 /winsup/cygwin/environ.cc | |
| parent | 8ba4144d501d622c5612417ef3c6929d47aa2f87 (diff) | |
* registry.cc (reg_key::get_dword): Rename from get_int, use DWORD
rather than int type. Avoid compiler warning.
(reg_key::set_dword): Rename from set_int, use DWORD rather than int
type. Change return type to NTSTATUS.
(reg_key::get_string): Change return type to NTSTATUS.
(reg_key::set_string): Ditto.
* registry.h: Accommodate above changes.
* environ.cc (regopt): Test return value of reg_key::get_string as
NTSTATUS.
* sched.cc (sched_rr_get_interval): Change local int vars to DWORD.
Call reg_key::get_dword instead of reg_key::get_int.
* shared.cc (init_installation_root): Test return value of
reg_key::get_string as NTSTATUS.
(shared_info::heap_slop_size): Call reg_key::get_dword rather than
reg_key::get_int.
(shared_info::heap_chunk_size): Ditto.
* shared_info.h (CURR_SHARED_MAGIC): Update.
(class shared_info): Change heap_chunk and heap_slop to DWORD values.
Diffstat (limited to 'winsup/cygwin/environ.cc')
| -rw-r--r-- | winsup/cygwin/environ.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc index 15fbb079d..ceebe60b4 100644 --- a/winsup/cygwin/environ.cc +++ b/winsup/cygwin/environ.cc @@ -712,7 +712,8 @@ regopt (const WCHAR *name, char *buf) { reg_key r (i, KEY_READ, _WIDE (CYGWIN_INFO_PROGRAM_OPTIONS_NAME), NULL); - if (r.get_string (lname.Buffer, (PWCHAR) buf, NT_MAX_PATH, L"") == ERROR_SUCCESS) + if (NT_SUCCESS (r.get_string (lname.Buffer, (PWCHAR) buf, + NT_MAX_PATH, L""))) { char *newp; sys_wcstombs_alloc(&newp, HEAP_NOTHEAP, (PWCHAR) buf); |