summaryrefslogtreecommitdiffstats
path: root/tdm
diff options
context:
space:
mode:
Diffstat (limited to 'tdm')
-rw-r--r--tdm/backend/socket.c42
-rw-r--r--tdm/kfrontend/kgreeter.cpp2
2 files changed, 22 insertions, 22 deletions
diff --git a/tdm/backend/socket.c b/tdm/backend/socket.c
index 677a3d32f..151fbc552 100644
--- a/tdm/backend/socket.c
+++ b/tdm/backend/socket.c
@@ -99,9 +99,9 @@ CreateListeningSocket( struct sockaddr *sock_addr, int salen )
return fd;
}
-struct socklist {
- struct socklist *next;
- struct socklist *mcastgroups;
+struct soctdelist {
+ struct soctdelist *next;
+ struct soctdelist *mcastgroups;
struct sockaddr *addr;
int salen;
int addrlen;
@@ -109,12 +109,12 @@ struct socklist {
int ref; /* referenced bit - see UpdateListenSockets */
};
-static struct socklist *listensocks;
+static struct soctdelist *listensocks;
static void
-DestroyListeningSocket( struct socklist *s )
+DestroyListeningSocket( struct soctdelist *s )
{
- struct socklist *g, *n;
+ struct soctdelist *g, *n;
if (s->fd >= 0) {
CloseNClearCloseOnFork( s->fd );
@@ -134,10 +134,10 @@ DestroyListeningSocket( struct socklist *s )
s->mcastgroups = NULL;
}
-static struct socklist*
-FindInList( struct socklist *list, ARRAY8Ptr addr )
+static struct soctdelist*
+FindInList( struct soctdelist *list, ARRAY8Ptr addr )
{
- struct socklist *s;
+ struct soctdelist *s;
for (s = list; s; s = s->next) {
if (s->addrlen == addr->length) {
@@ -165,12 +165,12 @@ FindInList( struct socklist *list, ARRAY8Ptr addr )
return NULL;
}
-static struct socklist *
-CreateSocklistEntry( ARRAY8Ptr addr )
+static struct soctdelist *
+CreateSoctdelistEntry( ARRAY8Ptr addr )
{
- struct socklist *s;
+ struct soctdelist *s;
- if (!(s = Calloc( 1, sizeof(struct socklist) )))
+ if (!(s = Calloc( 1, sizeof(struct soctdelist) )))
return NULL;
if (addr->length == 4) { /* IPv4 */
@@ -212,7 +212,7 @@ CreateSocklistEntry( ARRAY8Ptr addr )
static void
UpdateListener( ARRAY8Ptr addr, void **closure )
{
- struct socklist *s;
+ struct soctdelist *s;
*closure = NULL;
@@ -242,7 +242,7 @@ UpdateListener( ARRAY8Ptr addr, void **closure )
return;
}
- if (!(s = CreateSocklistEntry( addr )))
+ if (!(s = CreateSoctdelistEntry( addr )))
return;
if ((s->fd = CreateListeningSocket( s->addr, s->salen )) < 0) {
@@ -260,7 +260,7 @@ UpdateListener( ARRAY8Ptr addr, void **closure )
#define LEAVE_MCAST_GROUP 1
static void
-ChangeMcastMembership( struct socklist *s, struct socklist *g, int op )
+ChangeMcastMembership( struct soctdelist *s, struct soctdelist *g, int op )
{
int sockopt;
@@ -342,8 +342,8 @@ ChangeMcastMembership( struct socklist *s, struct socklist *g, int op )
static void
UpdateMcastGroup( ARRAY8Ptr addr, void **closure )
{
- struct socklist *s = (struct socklist *)*closure;
- struct socklist *g;
+ struct soctdelist *s = (struct soctdelist *)*closure;
+ struct soctdelist *g;
if (!s)
return;
@@ -355,7 +355,7 @@ UpdateMcastGroup( ARRAY8Ptr addr, void **closure )
}
/* Need to join the group */
- if (!(g = CreateSocklistEntry( addr )))
+ if (!(g = CreateSoctdelistEntry( addr )))
return;
ChangeMcastMembership( s, g, JOIN_MCAST_GROUP );
@@ -367,7 +367,7 @@ UpdateMcastGroup( ARRAY8Ptr addr, void **closure )
void
UpdateListenSockets( void )
{
- struct socklist *s, *g, **ls, **lg;
+ struct soctdelist *s, *g, **ls, **lg;
void *tmpPtr = NULL;
/* Clear Ref bits - any not marked by UpdateCallback will be closed */
@@ -404,7 +404,7 @@ AnyListenSockets( void )
int
ProcessListenSockets( FD_TYPE *reads )
{
- struct socklist *s;
+ struct soctdelist *s;
int ret = 0;
for (s = listensocks; s; s = s->next)
diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp
index 809f309ad..998573c52 100644
--- a/tdm/kfrontend/kgreeter.cpp
+++ b/tdm/kfrontend/kgreeter.cpp
@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <klocale.h>
#include <kstandarddirs.h>
#include <kseparator.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <ksimpleconfig.h>
#include <kstringhandler.h>
#include <kdebug.h>