about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2006-02-23 22:50:36 +0000
committerRoland McGrath <roland@gnu.org>2006-02-23 22:50:36 +0000
commit0f289b2a11ae12da5331f065bad765280eb8f95e (patch)
tree0a1ddd70a61f13630791092fa7fcdf0e0231d285 /sysdeps
parent10814720ad7553b3096e1e8bd4f5ce3e0b565c6c (diff)
downloadglibc-0f289b2a11ae12da5331f065bad765280eb8f95e.tar.gz
glibc-0f289b2a11ae12da5331f065bad765280eb8f95e.tar.xz
glibc-0f289b2a11ae12da5331f065bad765280eb8f95e.zip
[BZ #2172]
* sysdeps/unix/sysv/linux/i386/fchownat.c: Diddle code so that "fail"
	label is always used.

	[BZ #2172]
	* bits/syslog-path.h: New file.
	* misc/Makefile (headers): Add it.
	* misc/sys/syslog.h: Include it.
	(_PATH_LOG): Macro removed.
	From Robert Millan <robertmh@gnu.org>.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/unix/sysv/linux/i386/fchownat.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/fchownat.c b/sysdeps/unix/sysv/linux/i386/fchownat.c
index b2bac1913f..e5306db6ee 100644
--- a/sysdeps/unix/sysv/linux/i386/fchownat.c
+++ b/sysdeps/unix/sysv/linux/i386/fchownat.c
@@ -168,11 +168,11 @@ fchownat (int fd, const char *file, uid_t owner, gid_t group, int flag)
 #endif
 
   if (__builtin_expect (INTERNAL_SYSCALL_ERROR_P (result, err), 0))
-    {
-    fail:
-      __atfct_seterrno (INTERNAL_SYSCALL_ERRNO (result, err), fd, buf);
-      result = -1;
-    }
+    goto fail;
 
   return result;
+
+ fail:
+  __atfct_seterrno (INTERNAL_SYSCALL_ERRNO (result, err), fd, buf);
+  return -1;
 }