From cb7e1879ee3a55c91b8c85e6d2f879f392a2c995 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Thu, 11 Sep 2008 05:43:11 +0000 Subject: * localtime.cc (increment_overflow): Mark as non-inline to prevent compiler from complaining about the very thing we're trying to test. * ntea.cc (read_ea): Reorganize to avoid a new compiler warning/error. * sched.cc (sched_rr_get_interval): Ditto. * select.cc (peek_serial): Ditto. * libc/rexec.cc (ruserpass): Ditto. * posix_ipc.cc (ipc_names): Make static to avoid a compiler warning (and it's the right thing to do anyway). --- winsup/cygwin/ntea.cc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'winsup/cygwin/ntea.cc') diff --git a/winsup/cygwin/ntea.cc b/winsup/cygwin/ntea.cc index e64dc4d99..5b4ec3b53 100644 --- a/winsup/cygwin/ntea.cc +++ b/winsup/cygwin/ntea.cc @@ -65,14 +65,15 @@ read_ea (HANDLE hdl, path_conv &pc, const char *name, char *value, size_t size) /* Samba hides the user namespace from Windows clients. If we try to retrieve a user namespace item, we remove the leading namespace from the name, otherwise the search fails. */ - if (pc.fs_is_samba ()) - if (ascii_strncasematch (name, "user.", 5)) - name += 5; - else - { - set_errno (ENOATTR); - goto out; - } + if (!pc.fs_is_samba ()) + /* nothing to do */; + else if (ascii_strncasematch (name, "user.", 5)) + name += 5; + else + { + set_errno (ENOATTR); + goto out; + } if ((nlen = strlen (name)) >= MAX_EA_NAME_LEN) { -- cgit v1.2.3