From 76036892c2cdcb55be635eb9ada82e5b73dd7e7a Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Sat, 26 Apr 2014 18:05:08 +0200 Subject: [PATCH] Fix missing parentheses in grp and pwd implementation. --- libc/grp/getgrgid_r.cpp | 4 ++-- libc/grp/getgrnam_r.cpp | 4 ++-- libc/pwd/getpwnam_r.cpp | 4 ++-- libc/pwd/getpwuid_r.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libc/grp/getgrgid_r.cpp b/libc/grp/getgrgid_r.cpp index f5188462..15de23dc 100644 --- a/libc/grp/getgrgid_r.cpp +++ b/libc/grp/getgrgid_r.cpp @@ -1,6 +1,6 @@ /******************************************************************************* - Copyright(C) Jonas 'Sortie' Termansen 2013. + Copyright(C) Jonas 'Sortie' Termansen 2013, 2014. This file is part of the Sortix C Library. @@ -50,5 +50,5 @@ int getgrgid_r(gid_t gid, return *ret_ptr = *ret_ptr, 0; } fclose(fgroup); - return *ret_ptr = NULL, errnum ? errnum : errno = ENOGROUP; + return *ret_ptr = NULL, errnum ? errnum : (errno = ENOGROUP); } diff --git a/libc/grp/getgrnam_r.cpp b/libc/grp/getgrnam_r.cpp index 11ef93c1..6fd5e5f7 100644 --- a/libc/grp/getgrnam_r.cpp +++ b/libc/grp/getgrnam_r.cpp @@ -1,6 +1,6 @@ /******************************************************************************* - Copyright(C) Jonas 'Sortie' Termansen 2013. + Copyright(C) Jonas 'Sortie' Termansen 2013, 2014. This file is part of the Sortix C Library. @@ -51,5 +51,5 @@ int getgrnam_r(const char* restrict groupname, return *ret_ptr = *ret_ptr, 0; } fclose(fgroup); - return *ret_ptr = NULL, errnum ? errnum : errno = ENOGROUP; + return *ret_ptr = NULL, errnum ? errnum : (errno = ENOGROUP); } diff --git a/libc/pwd/getpwnam_r.cpp b/libc/pwd/getpwnam_r.cpp index 5b1cbf9e..7f00eeb9 100644 --- a/libc/pwd/getpwnam_r.cpp +++ b/libc/pwd/getpwnam_r.cpp @@ -1,6 +1,6 @@ /******************************************************************************* - Copyright(C) Jonas 'Sortie' Termansen 2013. + Copyright(C) Jonas 'Sortie' Termansen 2013, 2014. This file is part of the Sortix C Library. @@ -51,5 +51,5 @@ int getpwnam_r(const char* restrict username, return *ret_ptr = *ret_ptr, 0; } fclose(fpasswd); - return *ret_ptr = NULL, errnum ? errnum : errno = ENOUSER; + return *ret_ptr = NULL, errnum ? errnum : (errno = ENOUSER); } diff --git a/libc/pwd/getpwuid_r.cpp b/libc/pwd/getpwuid_r.cpp index 3d176041..6cc558d8 100644 --- a/libc/pwd/getpwuid_r.cpp +++ b/libc/pwd/getpwuid_r.cpp @@ -1,6 +1,6 @@ /******************************************************************************* - Copyright(C) Jonas 'Sortie' Termansen 2013. + Copyright(C) Jonas 'Sortie' Termansen 2013, 2014. This file is part of the Sortix C Library. @@ -50,5 +50,5 @@ int getpwuid_r(uid_t uid, return *ret_ptr = *ret_ptr, 0; } fclose(fpasswd); - return *ret_ptr = NULL, errnum ? errnum : errno = ENOUSER; + return *ret_ptr = NULL, errnum ? errnum : (errno = ENOUSER); }