diff options
Diffstat (limited to 'libkpgp/kpgpbase.cpp')
-rw-r--r-- | libkpgp/kpgpbase.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/libkpgp/kpgpbase.cpp b/libkpgp/kpgpbase.cpp index 157c73e3b..ec2ffd126 100644 --- a/libkpgp/kpgpbase.cpp +++ b/libkpgp/kpgpbase.cpp @@ -70,7 +70,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP ) int len, len2; FILE *pass; pid_t child_pid; - int childExitStatus; + int childExiStatus; struct pollfd pollin, pollout, pollerr; int pollstatus; @@ -251,8 +251,8 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP ) do { //kdDebug(5100) << "Checking if PGP is still running..." << endl; - childExitStatus = 0; - waitpidRetVal = waitpid(child_pid, &childExitStatus, WNOHANG); + childExiStatus = 0; + waitpidRetVal = waitpid(child_pid, &childExiStatus, WNOHANG); //kdDebug(5100) << "waitpid returned " << waitpidRetVal << endl; if (pout[0] >= 0) { do { @@ -351,14 +351,14 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP ) close(ppass[0]); // Did the child exit normally? - if (WIFEXITED(childExitStatus) != 0) { + if (WIFEXITED(childExiStatus) != 0) { // Get the return code of the child - childExitStatus = WEXITSTATUS(childExitStatus); - kdDebug(5100) << "PGP exited with exit status " << childExitStatus + childExiStatus = WEXITSTATUS(childExiStatus); + kdDebug(5100) << "PGP exited with exit status " << childExiStatus << endl; } else { - childExitStatus = -1; + childExiStatus = -1; kdDebug(5100) << "PGP exited abnormally!" << endl; } @@ -371,7 +371,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP ) */ kdDebug(5100) << error << endl; - return childExitStatus; + return childExiStatus; } @@ -387,7 +387,7 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG ) int len, len2; FILE *pass; pid_t child_pid; - int childExitStatus; + int childExiStatus; char gpgcmd[1024] = "\0"; struct pollfd poller[3]; int num_pollers = 0; @@ -529,8 +529,8 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG ) do { //kdDebug(5100) << "Checking if GnuPG is still running..." << endl; - childExitStatus = 0; - waitpidRetVal = waitpid(child_pid, &childExitStatus, WNOHANG); + childExiStatus = 0; + waitpidRetVal = waitpid(child_pid, &childExiStatus, WNOHANG); //kdDebug(5100) << "waitpid returned " << waitpidRetVal << endl; do { // poll the pipes @@ -645,14 +645,14 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG ) close(ppass[0]); // Did the child exit normally? - if (WIFEXITED(childExitStatus) != 0) { + if (WIFEXITED(childExiStatus) != 0) { // Get the return code of the child - childExitStatus = WEXITSTATUS(childExitStatus); - kdDebug(5100) << "GnuPG exited with exit status " << childExitStatus + childExiStatus = WEXITSTATUS(childExiStatus); + kdDebug(5100) << "GnuPG exited with exit status " << childExiStatus << endl; } else { - childExitStatus = -1; + childExiStatus = -1; kdDebug(5100) << "GnuPG exited abnormally!" << endl; } @@ -663,7 +663,7 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG ) // get to know what's going on during the gpg calls. kdDebug(5100) << "gpg stderr:\n" << error << endl; - return childExitStatus; + return childExiStatus; } |