From c419376b85ff4a489f3bf7ad97ed656495792523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= Date: Thu, 8 Dec 2022 15:20:14 +0100 Subject: cpp: Handle statuses that need no response in the base edit interactor * lang/cpp/src/editinteractor.cpp (edit_interactor_callback_impl): Do not call nextState() if status needs no response. * lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp (GpgAddExistingSubkeyEditInteractor::Private::nextState), lang/cpp/src/gpgadduserideditinteractor.cpp (GpgAddUserIDEditInteractor::nextState), lang/cpp/src/gpggencardkeyinteractor.cpp (GpgGenCardKeyInteractor::nextState), lang/cpp/src/gpgrevokekeyeditinteractor.cpp (GpgRevokeKeyEditInteractor::Private::nextState), lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp (GpgSetExpiryTimeEditInteractor::nextState), lang/cpp/src/gpgsetownertrusteditinteractor.cpp (GpgSetOwnerTrustEditInteractor::nextState), lang/cpp/src/gpgsignkeyeditinteractor.cpp (GpgSignKeyEditInteractor::nextState): Remove handling of statuses that need no response. -- This change removes superfluous code duplication. GnuPG-bug-id: 6305 --- lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp') diff --git a/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp b/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp index 8eec7460..49e98def 100644 --- a/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp +++ b/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp @@ -105,10 +105,6 @@ unsigned int GpgAddExistingSubkeyEditInteractor::Private::nextState(unsigned int static const Error NO_KEY_ERROR = Error::fromCode(GPG_ERR_NO_KEY); static const Error INV_TIME_ERROR = Error::fromCode(GPG_ERR_INV_TIME); - if (q->needsNoResponse(status)) { - return q->state(); - } - switch (q->state()) { case START: if (status == GPGME_STATUS_GET_LINE && -- cgit v1.2.3