[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/kdm
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2007-10-28 10:19:04
Message-ID: 1193566744.734399.20390.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 730270 by ossi:

64-bit cleanness


 M  +3 -3      backend/choose.c  
 M  +3 -3      backend/ctrl.c  
 M  +1 -1      backend/policy.c  
 M  +2 -2      backend/xdmcp.c  
 M  +3 -2      kfrontend/genkdmconf.c  


--- trunk/KDE/kdebase/workspace/kdm/backend/choose.c #730269:730270
@@ -368,7 +368,7 @@
 	name->willing = will;
 	name->status = *status;
 
-	gSendInt( (int)name ); /* just an id */
+	gSendInt( (int)(long)name ); /* just an id */
 	gSendNStr( (char *)name->hostname.data, name->hostname.length );
 	gSendNStr( (char *)name->status.data, name->status.length );
 	gSendInt( will );
@@ -852,7 +852,7 @@
 #endif
 
 	for (h = hostNamedb; h; h = h->next)
-		if ((int)h == hid) {
+		if ((int)(long)h == hid) {
 			/* XXX error handling */
 			gSet( &mstrtalk );
 			if ((td->displayType & d_location) == dLocal) {
@@ -971,7 +971,7 @@
 							h = (*hp)->next;
 							disposeHostname( *hp );
 							gSendInt( G_Ch_RemoveHost );
-							gSendInt( (int)*hp ); /* just an id */
+							gSendInt( (int)(long)*hp ); /* just an id */
 							*hp = h;
 						} else
 							hp = &(*hp)->next;
--- trunk/KDE/kdebase/workspace/kdm/backend/ctrl.c #730269:730270
@@ -340,7 +340,7 @@
 	           (d->allowNuke == SHUT_ROOT && d->userSess))) :
 	         !fifoAllowNuke))
 		*bp++ = '!';
-	writer( (int)ctx, cbuf, bp - cbuf );
+	writer( (int)(long)ctx, cbuf, bp - cbuf );
 }
 
 static void
@@ -387,7 +387,7 @@
 	          (!(pw = getpwnam( user )) || d->userSess != (int)pw->pw_uid)) :
 	         !fifoAllowNuke))
 		*bp++ = '!';
-	writer( (int)ctx, cbuf, bp - cbuf );
+	writer( (int)(long)ctx, cbuf, bp - cbuf );
 }
 
 static void
@@ -478,7 +478,7 @@
 					goto exce;
 			}
 			Reply( "ok" );
-			listSessions( flags, d, (void *)fd, emitXSessC, emitTTYSessC );
+			listSessions( flags, d, (void *)(long)fd, emitXSessC, emitTTYSessC );
 			Reply( "\n" );
 			goto bust;
 		} else if (!strcmp( ar[0], "reserve" )) {
--- trunk/KDE/kdebase/workspace/kdm/backend/policy.c #730269:730270
@@ -216,7 +216,7 @@
 			}
 			if (!ok)
 				sprintf( statusBuf, "Willing, but %.*s failed",
-				         sizeof(statusBuf) - 21, willing );
+				         (int)(sizeof(statusBuf) - 21), willing );
 		} else
 #ifdef WILLING_INTERNAL
 			willingMsg( statusBuf );
--- trunk/KDE/kdebase/workspace/kdm/backend/xdmcp.c #730269:730270
@@ -118,7 +118,7 @@
 	default:
 		return;
 	}
-	XdmcpFlush( (int)closure, &buffer, (XdmcpNetaddr)addr, addrlen );
+	XdmcpFlush( (int)(long)closure, &buffer, (XdmcpNetaddr)addr, addrlen );
 	return;
 }
 
@@ -217,7 +217,7 @@
 
 		localHostAsWell =
 			forEachMatchingIndirectHost( &clientAddress, connectionType,
-			                             sendForward, (char *)fd );
+			                             sendForward, (char *)(long)fd );
 
 		XdmcpDisposeARRAY8( &clientAddress );
 		XdmcpDisposeARRAY8( &clientPort );
--- trunk/KDE/kdebase/workspace/kdm/kfrontend/genkdmconf.c #730269:730270
@@ -768,7 +768,7 @@
 	char *p;
 
 	if ((p = strrchr( sec, '-' ))) {
-		sprintf( sname, "%.*s-%s", p - sec, sec, name );
+		sprintf( sname, "%.*s-%s", (int)(p - sec), sec, name );
 		return sname;
 	} else
 		return name;
@@ -2263,7 +2263,8 @@
 									sec = cs->name;
 								else {
 									sec = sname;
-									sprintf( sname, "%.*s-%s", cp - cs->name, cs->name,
+									sprintf( sname, "%.*s-%s",
+									         (int)(cp - cs->name), cs->name,
 									         kupsects[i].ents[j].nsec );
 								}
 								if (!kupsects[i].ents[j].nkey)
[prev in list] [next in list] [prev in thread] [next in thread]