summaryrefslogtreecommitdiffstats
path: root/kdm/backend
diff options
context:
space:
mode:
Diffstat (limited to 'kdm/backend')
-rw-r--r--kdm/backend/auth.c8
-rw-r--r--kdm/backend/dm.c24
-rw-r--r--kdm/backend/dm.h12
-rw-r--r--kdm/backend/greet.h4
-rw-r--r--kdm/backend/server.c18
-rw-r--r--kdm/backend/session.c6
6 files changed, 36 insertions, 36 deletions
diff --git a/kdm/backend/auth.c b/kdm/backend/auth.c
index 7d7af6e54..3fb18ac4c 100644
--- a/kdm/backend/auth.c
+++ b/kdm/backend/auth.c
@@ -1038,16 +1038,16 @@ static void
startUserAuth( char *buf, char *nbuf, FILE **old, FILE **new )
{
const char *home;
- int locktqStatus;
+ int lockStatus;
initAddrs();
*new = 0;
if ((home = getEnv( userEnviron, "HOME" )) && strlen( home ) < NBSIZE - 12) {
sprintf( buf, "%s/.Xauthority", home );
Debug( "XauLockAuth %s\n", buf );
- locktqStatus = XauLockAuth( buf, 1, 2, 10 );
- Debug( "lock is %d\n", locktqStatus );
- if (locktqStatus == LOCK_SUCCESS)
+ lockStatus = XauLockAuth( buf, 1, 2, 10 );
+ Debug( "lock is %d\n", lockStatus );
+ if (lockStatus == LOCK_SUCCESS)
if (!openFiles( buf, nbuf, old, new ))
XauUnlockAuth( buf );
}
diff --git a/kdm/backend/dm.c b/kdm/backend/dm.c
index d54cccb87..a372686df 100644
--- a/kdm/backend/dm.c
+++ b/kdm/backend/dm.c
@@ -288,11 +288,11 @@ main( int argc, char **argv )
LogError( "Failed to execute shutdown command %\"s\n", cmd );
exit( 1 );
} else {
- sigset_t tqmask;
- sigemptyset( &tqmask );
- sigaddset( &tqmask, SIGCHLD );
- sigaddset( &tqmask, SIGHUP );
- sigsuspend( &tqmask );
+ sigset_t mask;
+ sigemptyset( &mask );
+ sigaddset( &mask, SIGCHLD );
+ sigaddset( &mask, SIGHUP );
+ sigsuspend( &mask );
}
}
Debug( "nothing left to do, exiting\n" );
@@ -997,8 +997,8 @@ ReapChildren( void )
/* don't kill again */
break;
case running:
- if (startingServer == d && d->servertqStatus != ignore) {
- if (d->servertqStatus == starting && waitCode( status ) != 47)
+ if (startingServer == d && d->serverStatus != ignore) {
+ if (d->serverStatus == starting && waitCode( status ) != 47)
LogError( "X server died during startup\n" );
StartServerFailed();
break;
@@ -1183,7 +1183,7 @@ MainLoop( void )
break;
case SIGUSR1:
if (startingServer &&
- startingServer->servertqStatus == starting)
+ startingServer->serverStatus == starting)
StartServerSuccess();
break;
}
@@ -1214,7 +1214,7 @@ MainLoop( void )
}
static void
-CheckDisplaytqStatus( struct display *d )
+CheckDisplayStatus( struct display *d )
{
if ((d->displayType & d_origin) == dFromFile && !d->stillThere)
StopDisplay( d );
@@ -1235,7 +1235,7 @@ KickDisplay( struct display *d )
{
if (d->status == notRunning)
StartDisplay( d );
- if (d->servertqStatus == awaiting && !startingServer)
+ if (d->serverStatus == awaiting && !startingServer)
StartServer( d );
}
@@ -1314,7 +1314,7 @@ AllocateVT( struct display *d )
static void
StartDisplays( void )
{
- ForEachDisplay( CheckDisplaytqStatus );
+ ForEachDisplay( CheckDisplayStatus );
CloseGetter();
#ifdef HAVE_VTS
active_vts = -1;
@@ -1356,7 +1356,7 @@ StartDisplay( struct display *d )
kill( d->serverPid, d->resetSignal );
}
if (d->serverPid == -1) {
- d->servertqStatus = awaiting;
+ d->serverStatus = awaiting;
return;
}
} else {
diff --git a/kdm/backend/dm.h b/kdm/backend/dm.h
index f73f68e10..c05d4c865 100644
--- a/kdm/backend/dm.h
+++ b/kdm/backend/dm.h
@@ -181,11 +181,11 @@ typedef struct GProc {
int pid;
} GProc;
-typedef enum displaytqStatus { notRunning = 0, running, zombie, phoenix, raiser,
- textMode, reserve, remoteLogin } DisplaytqStatus;
+typedef enum displayStatus { notRunning = 0, running, zombie, phoenix, raiser,
+ textMode, reserve, remoteLogin } DisplayStatus;
-typedef enum servertqStatus { ignore = 0, awaiting, starting,
- terminated, killed, pausing } ServertqStatus;
+typedef enum serverStatus { ignore = 0, awaiting, starting,
+ terminated, killed, pausing } ServerStatus;
typedef struct RcStr {
struct RcStr *next;
@@ -241,7 +241,7 @@ struct display {
CfgArr cfg; /* config data array */
/* display state */
- DisplaytqStatus status; /* current status */
+ DisplayStatus status; /* current status */
int zstatus; /* substatus while zombie */
int pid; /* process id of child */
int serverPid; /* process id of server (-1 if none) */
@@ -249,7 +249,7 @@ struct display {
int serverVT; /* server VT (0 = none, -1 = pending) */
struct display *follower; /* on exit, hand VT to this display */
#endif
- ServertqStatus servertqStatus; /* X server startup state */
+ ServerStatus serverStatus; /* X server startup state */
Time_t lastStart; /* time of last display start */
int startTries; /* current start try */
int stillThere; /* state during HUP processing */
diff --git a/kdm/backend/greet.h b/kdm/backend/greet.h
index 2b7b28504..985edc29c 100644
--- a/kdm/backend/greet.h
+++ b/kdm/backend/greet.h
@@ -111,7 +111,7 @@ from the copyright holder.
#endif
/*
- * tqStatus/command codes greeter -> core
+ * Status/command codes greeter -> core
*/
#define G_Ready 0 /* nop */
#define G_Cancel 1 /* abort login, etc. */
@@ -194,7 +194,7 @@ from the copyright holder.
#define DM_PANIC 4
/*
- * tqStatus codes from Verify
+ * Status codes from Verify
*/
/* terminal status codes */
#define V_OK 0
diff --git a/kdm/backend/server.c b/kdm/backend/server.c
index c5f0c3136..e78d8a66c 100644
--- a/kdm/backend/server.c
+++ b/kdm/backend/server.c
@@ -77,7 +77,7 @@ StartServerOnce( void )
int pid;
Debug( "StartServerOnce for %s, try %d\n", d->name, ++d->startTries );
- d->servertqStatus = starting;
+ d->serverStatus = starting;
switch (pid = Fork()) {
case 0:
argv = PrepServerArgv( d, d->serverArgsLocal );
@@ -136,9 +136,9 @@ AbortStartServer( struct display *d )
{
if (startingServer == d)
{
- if (d->servertqStatus != ignore)
+ if (d->serverStatus != ignore)
{
- d->servertqStatus = ignore;
+ d->serverStatus = ignore;
serverTimeout = TO_INF;
Debug( "aborting X server start\n" );
}
@@ -150,7 +150,7 @@ void
StartServerSuccess()
{
struct display *d = startingServer;
- d->servertqStatus = ignore;
+ d->serverStatus = ignore;
serverTimeout = TO_INF;
Debug( "X server ready, starting session\n" );
StartDisplayP2( d );
@@ -161,10 +161,10 @@ StartServerFailed()
{
struct display *d = startingServer;
if (!d->serverAttempts || d->startTries < d->serverAttempts) {
- d->servertqStatus = pausing;
+ d->serverStatus = pausing;
serverTimeout = d->openDelay + now;
} else {
- d->servertqStatus = ignore;
+ d->serverStatus = ignore;
serverTimeout = TO_INF;
startingServer = 0;
LogError( "X server for display %s can't be started,"
@@ -177,20 +177,20 @@ void
StartServerTimeout()
{
struct display *d = startingServer;
- switch (d->servertqStatus) {
+ switch (d->serverStatus) {
case ignore:
case awaiting:
break; /* cannot happen */
case starting:
LogError( "X server startup timeout, terminating\n" );
kill( d->serverPid, d->termSignal );
- d->servertqStatus = d->termSignal == SIGKILL ? killed : terminated;
+ d->serverStatus = d->termSignal == SIGKILL ? killed : terminated;
serverTimeout = d->serverTimeout + now;
break;
case terminated:
LogInfo( "X server termination timeout, killing\n" );
kill( d->serverPid, SIGKILL );
- d->servertqStatus = killed;
+ d->serverStatus = killed;
serverTimeout = 10 + now;
break;
case killed:
diff --git a/kdm/backend/session.c b/kdm/backend/session.c
index d603c6b44..9a12ce312 100644
--- a/kdm/backend/session.c
+++ b/kdm/backend/session.c
@@ -154,13 +154,13 @@ AutoLogon( Time_t tdiff )
!td->hstent->lastExit)) ||
td->autoAgain))
{
- unsigned int ltqmask;
+ unsigned int lmask;
Window dummy1, dummy2;
int dummy3, dummy4, dummy5, dummy6;
XQueryPointer( dpy, DefaultRootWindow( dpy ),
&dummy1, &dummy2, &dummy3, &dummy4, &dummy5, &dummy6,
- &ltqmask );
- if (ltqmask & ShiftMask)
+ &lmask );
+ if (lmask & ShiftMask)
return 0;
DoAutoLogon();
return 1;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-14 17:56:55 +0000