From 10aabbf959dd7d654bded66e2a70d56b922e79c6 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 14 Jun 2007 10:01:04 +0000 Subject: [PATCH] (init_user_info): Fix weird formatting not following GNU coding guidelines. --- src/w32.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/w32.c b/src/w32.c index 9ad82c7a23..6d4e968b3c 100644 --- a/src/w32.c +++ b/src/w32.c @@ -486,20 +486,16 @@ init_user_info () the user-sid as the user id value (same for group id using the primary group sid from the process token). */ - char user_sid[256], name[256], domain[256]; - DWORD length = sizeof (name), dlength = sizeof (domain), trash; - HANDLE token = NULL; - SID_NAME_USE user_type; - - if ( - open_process_token (GetCurrentProcess (), TOKEN_QUERY, &token) - && get_token_information ( - token, TokenUser, - (PVOID) user_sid, sizeof (user_sid), &trash) - && lookup_account_sid ( - NULL, *((PSID *) user_sid), name, &length, - domain, &dlength, &user_type) - ) + char user_sid[256], name[256], domain[256]; + DWORD length = sizeof (name), dlength = sizeof (domain), trash; + HANDLE token = NULL; + SID_NAME_USE user_type; + + if (open_process_token (GetCurrentProcess (), TOKEN_QUERY, &token) + && get_token_information (token, TokenUser, + (PVOID) user_sid, sizeof (user_sid), &trash) + && lookup_account_sid (NULL, *((PSID *) user_sid), name, &length, + domain, &dlength, &user_type)) { strcpy (the_passwd.pw_name, name); /* Determine a reasonable uid value. */ @@ -524,7 +520,7 @@ init_user_info () /* Get group id */ if (get_token_information (token, TokenPrimaryGroup, - (PVOID) user_sid, sizeof (user_sid), &trash)) + (PVOID) user_sid, sizeof (user_sid), &trash)) { SID_IDENTIFIER_AUTHORITY * pSIA; @@ -541,7 +537,7 @@ init_user_info () } } /* If security calls are not supported (presumably because we - are running under Windows 95), fallback to this. */ + are running under Windows 95), fallback to this. */ else if (GetUserName (name, &length)) { strcpy (the_passwd.pw_name, name); -- 2.20.1