D28097: GIT_SILENT clang-format kpasswdserver.*
This revision was automatically updated to reflect the committed changes. Closed by commit R241:66837e4c049d: GIT_SILENT clang-format kpasswdserver.* (authored by ahmadsamir). REPOSITORY R241 KIO CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D28097?vs=78157=78158 REVISION DETAIL https://phabricator.kde.org/D28097 AFFECTED FILES src/kpasswdserver/autotests/kpasswdservertest.cpp src/kpasswdserver/kiod_kpasswdserver.cpp src/kpasswdserver/kpasswdserver.cpp src/kpasswdserver/kpasswdserver.h To: ahmadsamir, #frameworks, dfaure, apol Cc: kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, ngraham, bruns
D28097: GIT_SILENT clang-format kpasswdserver.*
ahmadsamir updated this revision to Diff 78157. ahmadsamir added a comment. Rebase on master REPOSITORY R241 KIO CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D28097?vs=78155=78157 BRANCH l-kpasswdserver-clang-format (branched from master) REVISION DETAIL https://phabricator.kde.org/D28097 AFFECTED FILES src/kpasswdserver/autotests/kpasswdservertest.cpp src/kpasswdserver/kiod_kpasswdserver.cpp src/kpasswdserver/kpasswdserver.cpp src/kpasswdserver/kpasswdserver.h To: ahmadsamir, #frameworks, dfaure, apol Cc: kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, ngraham, bruns
D28097: GIT_SILENT clang-format kpasswdserver.*
dfaure accepted this revision. dfaure added a comment. This revision is now accepted and ready to land. Thanks. Let's do manual changes separately :-) REPOSITORY R241 KIO BRANCH l-kpasswdserver-clang-format (branched from master) REVISION DETAIL https://phabricator.kde.org/D28097 To: ahmadsamir, #frameworks, dfaure, apol Cc: kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, ngraham, bruns
D28097: GIT_SILENT clang-format kpasswdserver.*
ahmadsamir updated this revision to Diff 78155. ahmadsamir retitled this revision from "GIT_SILENT clang-format kpasswdserver.* plus some manual changes" to "GIT_SILENT clang-format kpasswdserver.*". ahmadsamir added a comment. Verbatim REPOSITORY R241 KIO CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D28097?vs=78154=78155 BRANCH l-kpasswdserver-clang-format (branched from master) REVISION DETAIL https://phabricator.kde.org/D28097 AFFECTED FILES src/kpasswdserver/autotests/kpasswdservertest.cpp src/kpasswdserver/kiod_kpasswdserver.cpp src/kpasswdserver/kpasswdserver.cpp src/kpasswdserver/kpasswdserver.h To: ahmadsamir, #frameworks, dfaure, apol Cc: kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, ngraham, bruns
D28097: GIT_SILENT clang-format kpasswdserver.* plus some manual changes
ahmadsamir updated this revision to Diff 78154. ahmadsamir added a comment. clang-format only, less prone to errors, as the level of stupidity of the tool is locked at the compile time of the tool (unlike manual changes) REPOSITORY R241 KIO CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D28097?vs=77816=78154 BRANCH l-kpasswdserver-clang-format (branched from master) REVISION DETAIL https://phabricator.kde.org/D28097 AFFECTED FILES src/kpasswdserver/autotests/kpasswdservertest.cpp src/kpasswdserver/kiod_kpasswdserver.cpp src/kpasswdserver/kpasswdserver.cpp src/kpasswdserver/kpasswdserver.h To: ahmadsamir, #frameworks, dfaure, apol Cc: kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, ngraham, bruns
D28097: GIT_SILENT clang-format kpasswdserver.* plus some manual changes
dfaure requested changes to this revision.
dfaure added inline comments.
This revision now requires changes to proceed.
INLINE COMMENTS
> kpasswdserver.cpp:249
> #ifdef HAVE_KF5WALLET
> -if (!result &&
> -!m_walletDisabled &&
> -(info.username.isEmpty() || info.password.isEmpty()) &&
> -
> !KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(),
> -
> KWallet::Wallet::PasswordFolder(),
> - makeWalletKey(key,
> info.realmValue)))
> -{
> +const bool keyExists =
> !KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(),
> KWallet::Wallet::PasswordFolder(), makeWalletKey(key, info.realmValue));
> +if (!result
This didn't use to be called when m_walletDisabled is true.
Make it a lambda if you want to simplify the if() condition while still
preserving evaluation order?
Or better: let's not change code in a "reformatting" commit... It's too
dangerous. I could have missed this. Reviewing reformatting from a tool and
reviewing changes made by a human are two different kinds of reviews :-)
> kpasswdserver.cpp:309
> #ifdef HAVE_KF5WALLET
> -if (!result &&
> -!m_walletDisabled &&
> -(info.username.isEmpty() || info.password.isEmpty()) &&
> -
> !KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(),
> -
> KWallet::Wallet::PasswordFolder(),
> - makeWalletKey(key,
> info.realmValue)))
> -{
> +const bool keyExists =
> !KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(),
> KWallet::Wallet::PasswordFolder(), makeWalletKey(key, info.realmValue));
> +if (!result
same
> kpasswdserver.cpp:748
> const bool bypassCacheAndKWallet =
> info.getExtraField(AUTHINFO_EXTRAFIELD_BYPASS_CACHE_AND_KWALLET).toBool();
> -if ( !bypassCacheAndKWallet
> -&& ( username.isEmpty() || password.isEmpty() )
> +const bool keyExists =
> !KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(),
> +
> KWallet::Wallet::PasswordFolder(),
same
REPOSITORY
R241 KIO
REVISION DETAIL
https://phabricator.kde.org/D28097
To: ahmadsamir, #frameworks, dfaure, apol
Cc: kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, ngraham, bruns
D28097: GIT_SILENT clang-format kpasswdserver.* plus some manual changes
ahmadsamir created this revision. ahmadsamir added reviewers: Frameworks, dfaure, apol. Herald added a project: Frameworks. ahmadsamir requested review of this revision. REVISION SUMMARY Braces around if blocks. TEST PLAN make && ctest REPOSITORY R241 KIO BRANCH l-kpasswdserver-clang-format (branched from master) REVISION DETAIL https://phabricator.kde.org/D28097 AFFECTED FILES src/kpasswdserver/kiod_kpasswdserver.cpp src/kpasswdserver/kpasswdserver.cpp src/kpasswdserver/kpasswdserver.h To: ahmadsamir, #frameworks, dfaure, apol Cc: kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, ngraham, bruns
