From 51564c783f61f2c218badac70366381b8abb4c4f Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 30 Mar 2011 08:22:59 +0000 Subject: [PATCH] * regtool.cc (cmd_set): Avoid a compiler warning. --- winsup/utils/ChangeLog | 4 ++++ winsup/utils/regtool.cc | 12 +++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 9ad6ffdbc..5b028c1a0 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,7 @@ +2011-02-29 Corinna Vinschen + + * regtool.cc (cmd_set): Avoid a compiler warning. + 2011-02-29 Corinna Vinschen * cygcheck.cc (handle_unique_object_name): Avoid a compiler warning. diff --git a/winsup/utils/regtool.cc b/winsup/utils/regtool.cc index 0da7ecad0..b4463f211 100644 --- a/winsup/utils/regtool.cc +++ b/winsup/utils/regtool.cc @@ -697,11 +697,13 @@ cmd_set () break; case REG_SZ: case REG_EXPAND_SZ: - n = mbstowcs (NULL, a, 0); - wchar_t w[n + 1]; - mbstowcs (w, a, n + 1); - rv = RegSetValueExW (key, value, 0, value_type, - (const BYTE *) w, (n + 1) * sizeof (wchar_t)); + { + n = mbstowcs (NULL, a, 0); + wchar_t w[n + 1]; + mbstowcs (w, a, n + 1); + rv = RegSetValueExW (key, value, 0, value_type, + (const BYTE *) w, (n + 1) * sizeof (wchar_t)); + } break; case REG_MULTI_SZ: for (i = 1, max_n = 1; argv[i]; i++)