From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:59:50 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
---
 libkpgp/kpgpbase.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'libkpgp/kpgpbase.cpp')

diff --git a/libkpgp/kpgpbase.cpp b/libkpgp/kpgpbase.cpp
index 591a9943..d30f0fd1 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 childExiStatus;
+  int childExitqStatus;
   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;
-    childExiStatus = 0;
-    waitpidRetVal = waitpid(child_pid, &childExiStatus, WNOHANG);
+    childExitqStatus = 0;
+    waitpidRetVal = waitpid(child_pid, &childExitqStatus, 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(childExiStatus) != 0) {
+  if (WIFEXITED(childExitqStatus) != 0) {
     // Get the return code of the child
-    childExiStatus = WEXITSTATUS(childExiStatus);
-    kdDebug(5100) << "PGP exited with exit status " << childExiStatus
+    childExitqStatus = WEXITSTATUS(childExitqStatus);
+    kdDebug(5100) << "PGP exited with exit status " << childExitqStatus
                   << endl;
   }
   else {
-    childExiStatus = -1;
+    childExitqStatus = -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 childExiStatus;
+  return childExitqStatus;
 }
 
 
@@ -387,7 +387,7 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG )
   int len, len2;
   FILE *pass;
   pid_t child_pid;
-  int childExiStatus;
+  int childExitqStatus;
   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;
-    childExiStatus = 0;
-    waitpidRetVal = waitpid(child_pid, &childExiStatus, WNOHANG);
+    childExitqStatus = 0;
+    waitpidRetVal = waitpid(child_pid, &childExitqStatus, 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(childExiStatus) != 0) {
+  if (WIFEXITED(childExitqStatus) != 0) {
     // Get the return code of the child
-    childExiStatus = WEXITSTATUS(childExiStatus);
-    kdDebug(5100) << "GnuPG exited with exit status " << childExiStatus
+    childExitqStatus = WEXITSTATUS(childExitqStatus);
+    kdDebug(5100) << "GnuPG exited with exit status " << childExitqStatus
                   << endl;
   }
   else {
-    childExiStatus = -1;
+    childExitqStatus = -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 childExiStatus;
+  return childExitqStatus;
 }
 
 
-- 
cgit v1.2.3