From 83677e35509b4dafac63b76995652bdf3b49f209 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:34 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 808e453c56036211f57482ed847d54aca01bba68. --- kppp/opener.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'kppp/opener.cpp') diff --git a/kppp/opener.cpp b/kppp/opener.cpp index 5d90cc0e..0d46edd9 100644 --- a/kppp/opener.cpp +++ b/kppp/opener.cpp @@ -128,7 +128,7 @@ extern "C" { static void sighandler_child(int); static pid_t pppdPid = -1; -static int pppdExitStatus = -1; +static int pppdExittqStatus = -1; static int checkForInterface(); // processing will stop at first file that could be opened successfully @@ -316,10 +316,10 @@ void Opener::mainLoop() { sendResponse(&response); break; - case PPPDExitStatus: + case PPPDExittqStatus: Debug("Opener: received PPPDExitStatus"); MY_ASSERT(len == sizeof(struct PPPDExitStatusRequest)); - response.status = pppdExitStatus; + response.status = pppdExittqStatus; sendResponse(&response); break; @@ -519,7 +519,7 @@ bool Opener::execpppd(const char *arguments) { if(ttyfd<0) return false; - pppdExitStatus = -1; + pppdExittqStatus = -1; switch(pppdPid = fork()) { @@ -711,10 +711,10 @@ void sighandler_child(int) { Debug("It was pppd that died"); pppdPid = -1; if((WIFEXITED(status))) { - pppdExitStatus = (WEXITSTATUS(status)); - Debug2("pppd exited with return value %d\n", pppdExitStatus); + pppdExittqStatus = (WEXITSTATUS(status)); + Debug2("pppd exited with return value %d\n", pppdExittqStatus); } else { - pppdExitStatus = 99; + pppdExittqStatus = 99; Debug("pppd exited abnormally."); } Debug2("Sending %i a SIGUSR1\n", getppid()); -- cgit v1.2.1