From 9da858e3e039ae5b3b82fa8d2b15ea6aaa1619ba Mon Sep 17 00:00:00 2001 From: Reinhard Pfau Date: Mon, 7 Apr 2008 13:11:55 +0000 Subject: [PATCH] reverted some unwanted space changes --- src/userfunc.cpp | 62 +++++++++++++++++++++++++++--------------------------- src/userfunc.hxx | 28 ++++++++++++------------ 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/userfunc.cpp b/src/userfunc.cpp index 913edcd..2930ecd 100644 --- a/src/userfunc.cpp +++ b/src/userfunc.cpp @@ -92,9 +92,9 @@ User::User() * @brief constructs and fills with user data. * @param name the name of the user to search for. */ -User::User (const std::string& name) +User::User(const std::string& name) { - get_user (name,*this); + get_user(name,*this); } // eo User::User(const std::string&) @@ -102,9 +102,9 @@ User::User (const std::string& name) * @brief constructs and fills with user data. * @param name the name of the user to search for. */ -User::User (const char* name) +User::User(const char* name) { - get_user (std::string (name),*this); + get_user(std::string (name),*this); } // eo User::User(const char*) @@ -112,9 +112,9 @@ User::User (const char* name) * @brief constructs and fills with user data. * @param uid the uid of the user to search for. */ -User::User (uid_t uid) +User::User(uid_t uid) { - get_user (uid,*this); + get_user(uid,*this); this->Uid = uid; } // eo User::User(uid_t) @@ -165,9 +165,9 @@ Group::Group() * @brief constructs and fills with group data. * @param name the name of the group to search for. */ -Group::Group (const std::string& name) +Group::Group(const std::string& name) { - get_group (name,*this); + get_group(name,*this); } // eo group::Group(const std::strring&) @@ -175,9 +175,9 @@ Group::Group (const std::string& name) * @brief constructs and fills with group data. * @param name the name of the group to search for. */ -Group::Group (const char* name) +Group::Group(const char* name) { - get_group (std::string (name),*this); + get_group(std::string (name),*this); } // eo group::Group(const char*) @@ -185,9 +185,9 @@ Group::Group (const char* name) * @brief constructs and fills with group data. * @param gid the gid of the group to search for. */ -Group::Group (gid_t gid) +Group::Group(gid_t gid) { - get_group (gid,*this); + get_group(gid,*this); this->Gid= gid; } // eo Group::Group(gid_t); @@ -222,21 +222,21 @@ bool Group::is_valid() const * @param[out] result the user info. * @return @a true iff the user was found and the result structure contains data. */ -bool get_user (const std::string& name, User& result) +bool get_user(const std::string& name, User& result) { struct passwd pw; struct passwd *pw_ptr= NULL; size_t buffer_size= sysconf (_SC_GETPW_R_SIZE_MAX); boost::scoped_array< char > buffer ( new char[ buffer_size ] ); - int res= ::getpwnam_r ( name.c_str(), &pw, buffer.get(), buffer_size, &pw_ptr); + int res= ::getpwnam_r(name.c_str(), &pw, buffer.get(), buffer_size, &pw_ptr); if (not (0 == res) or not pw_ptr) { return false; } - return copy_data (pw_ptr, result); + return copy_data(pw_ptr, result); } // eo get_user(const std::string&,User&) @@ -246,21 +246,21 @@ bool get_user (const std::string& name, User& result) * @param[out] result the user info. * @return @a true iff the user was found and the result structure contains data. */ -bool get_user (uid_t uid, User& result) +bool get_user(uid_t uid, User& result) { struct passwd pw; struct passwd *pw_ptr= NULL; size_t buffer_size= sysconf (_SC_GETPW_R_SIZE_MAX); boost::scoped_array< char > buffer ( new char[ buffer_size ] ); - int res= ::getpwuid_r ( uid, &pw, buffer.get(), buffer_size, &pw_ptr); + int res= ::getpwuid_r(uid, &pw, buffer.get(), buffer_size, &pw_ptr); if (not (0 == res) or not pw_ptr) { return false; } - return copy_data (pw_ptr, result); + return copy_data(pw_ptr, result); } // eo get_user(uid_t,User&) @@ -269,10 +269,10 @@ bool get_user (uid_t uid, User& result) * @param name name of the user * @return the user data (invalid if user not found or on error). */ -User get_user (const std::string& name) +User get_user(const std::string& name) { User result; - get_user (name,result); + get_user(name,result); return result; } // eo get_user(const std::string&) @@ -282,10 +282,10 @@ User get_user (const std::string& name) * @param uid uid of the user * @return the user data (invalid if user not found or on error). */ -User get_user (uid_t uid) +User get_user(uid_t uid) { User result; - get_user (uid,result); + get_user(uid,result); return result; } // eo get_user(const std::string&) @@ -304,14 +304,14 @@ bool get_group (const std::string& name, Group& result) size_t buffer_size= sysconf (_SC_GETGR_R_SIZE_MAX); boost::scoped_array< char > buffer ( new char[ buffer_size ] ); - int res= ::getgrnam_r ( name.c_str(), &gr, buffer.get(), buffer_size, &gr_ptr); + int res= ::getgrnam_r(name.c_str(), &gr, buffer.get(), buffer_size, &gr_ptr); if (not (0 == res) or not gr_ptr) { return false; } - return copy_data (gr_ptr, result); + return copy_data(gr_ptr, result); } // eo get_group(const std::string&,Group&) @@ -321,21 +321,21 @@ bool get_group (const std::string& name, Group& result) * @param[out] result the group info. * @return @a true iff the group was found and the result structure contains data. */ -bool get_group (gid_t gid, Group& result) +bool get_group(gid_t gid, Group& result) { struct group gr; struct group *gr_ptr= NULL; size_t buffer_size= sysconf (_SC_GETGR_R_SIZE_MAX); boost::scoped_array< char > buffer ( new char[ buffer_size ] ); - int res= ::getgrgid_r ( gid, &gr, buffer.get(), buffer_size, &gr_ptr); + int res= ::getgrgid_r(gid, &gr, buffer.get(), buffer_size, &gr_ptr); if (not (0 == res) or not gr_ptr) { return false; } - return copy_data (gr_ptr, result); + return copy_data(gr_ptr, result); } // eo get_group(const std::string&,Group&) @@ -344,10 +344,10 @@ bool get_group (gid_t gid, Group& result) * @param name name of the group * @return the group data (invalid if group not found or on error). */ -Group get_group (const std::string& name) +Group get_group(const std::string& name) { Group result; - get_group (name, result); + get_group(name, result); return result; } // eo get_group(const std::string&) @@ -357,10 +357,10 @@ Group get_group (const std::string& name) * @param gid gid of the group * @return the group data (invalid if group not found or on error). */ -Group get_group (gid_t gid) +Group get_group(gid_t gid) { Group result; - get_group (gid, result); + get_group(gid, result); return result; } // eo get_group(const std::string&) diff --git a/src/userfunc.hxx b/src/userfunc.hxx index a0c8a70..4ac1008 100644 --- a/src/userfunc.hxx +++ b/src/userfunc.hxx @@ -37,9 +37,9 @@ struct User std::string Shell; User(); - User (const std::string& name); - User (const char* name); - User (uid_t uid); + User(const std::string& name); + User(const char* name); + User(uid_t uid); void clear(); bool is_valid() const; @@ -60,9 +60,9 @@ struct Group std::vector< std::string > Members; Group(); - Group (const std::string& name); - Group (const char* name); - Group (gid_t gid); + Group(const std::string& name); + Group(const char* name); + Group(gid_t gid); void clear(); bool is_valid() const; @@ -70,17 +70,17 @@ struct Group operator bool() const { return is_valid(); } }; // eo struct Group -bool get_user (const std::string& name, User& result); -bool get_user (uid_t uid, User& result); +bool get_user(const std::string& name, User& result); +bool get_user(uid_t uid, User& result); -User get_user (const std::string& name); -User get_user (uid_t uid); +User get_user(const std::string& name); +User get_user(uid_t uid); -bool get_group (const std::string& name, Group& result); -bool get_group (gid_t gid, Group& result); +bool get_group(const std::string& name, Group& result); +bool get_group(gid_t gid, Group& result); -Group get_group (const std::string& name); -Group get_group (gid_t gid); +Group get_group(const std::string& name); +Group get_group(gid_t gid); } // eo namespace I2n -- 1.7.1