[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:53:44
Message-ID: 1193568824.594555.21584.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 730280 by ossi:

use void pointers for pointers to anonymous data.
could use pointers to unions if c99 was allowed ...


 M  +2 -2      backend/dm.h  
 M  +11 -11    backend/resource.c  
 M  +3 -2      backend/session.c  
 M  +1 -1      confproc.pl  


--- trunk/KDE/kdebase/workspace/kdm/backend/dm.h #730279:730280
@@ -199,7 +199,7 @@
 } CfgDep;
 
 typedef struct CfgArr {
-	char *data;     /* config value array; allocated */
+	void *data;     /* config value array; allocated */
 	long *idx;      /* config index array; alias */
 	CfgDep dep;     /* filestamp */
 	int numCfgEnt;  /* number of config entries */
@@ -418,7 +418,7 @@
 void pseudoReset( void );
 
 /* in resource.c */
-char **findCfgEnt( struct display *d, int id );
+void **findCfgEnt( struct display *d, int id );
 int initResources( char **argv );
 int loadDMResources( int force );
 int loadDisplayResources( struct display *d );
--- trunk/KDE/kdebase/workspace/kdm/backend/resource.c #730279:730280
@@ -283,7 +283,7 @@
 }
 
 static void
-applyResource( int id, char **src, char **dst )
+applyResource( int id, void **src, void **dst )
 {
 	switch (id & C_TYPE_MASK) {
 	case C_TYPE_INT:
@@ -291,7 +291,7 @@
 		break;
 	case C_TYPE_STR:
 	case C_TYPE_ARGV:
-		*dst = *src;
+		*(char **)dst = *(char **)src;
 		break;
 	}
 }
@@ -317,7 +317,7 @@
 
 CfgArr cfg;
 
-char **
+void **
 findCfgEnt( struct display *d, int id )
 {
 	int i;
@@ -329,7 +329,7 @@
  */
 	for (i = 0; i < cfg.numCfgEnt; i++)
 		if (cfg.idx[i] == id)
-			return ((char **)cfg.data) + i;
+			return ((void **)cfg.data) + i;
 	if (d) {
 /* no per-display variables exported currently
 		for (i = 0; i < as(dpyEnt); i++)
@@ -338,10 +338,10 @@
  */
 		for (i = 0; i < d->cfg.numCfgEnt; i++)
 			if (d->cfg.idx[i] == id)
-				return ((char **)d->cfg.data) + i;
+				return ((void **)d->cfg.data) + i;
 	}
 	debug( "unknown config entry %#x requested\n", id );
-	return (char **)0;
+	return (void **)0;
 }
 
 
@@ -349,7 +349,7 @@
 
 struct globVals {
 		int id;
-		char **off;
+		void *ptr;
 } globVal[] = {
 CONF_CORE_GLOBALS
 };
@@ -358,7 +358,7 @@
 loadDMResources( int force )
 {
 	int i, ret;
-	char **ent;
+	void **ent;
 
 	if (Setjmp( cnftalk.errjmp ))
 		return -1; /* may memleak, but we probably have to abort anyway */
@@ -372,7 +372,7 @@
 		if (!(ent = findCfgEnt( 0, globVal[i].id )))
 			ret = -1;
 		else
-			applyResource( globVal[i].id, ent, globVal[i].off );
+			applyResource( globVal[i].id, ent, (void **)globVal[i].ptr );
 	}
 	if (ret < 0)
 		logError( "Internal error: config reader supplied incomplete data\n" );
@@ -391,7 +391,7 @@
 loadDisplayResources( struct display *d )
 {
 	int i, ret;
-	char **ent;
+	void **ent;
 
 	if (Setjmp( cnftalk.errjmp ))
 		return -1; /* may memleak */
@@ -408,7 +408,7 @@
 			ret = -1;
 		else
 			applyResource( dpyVal[i].id, ent,
-			               (char **)(((char *)d) + dpyVal[i].off) );
+			               (void **)(((char *)d) + dpyVal[i].off) );
 	}
 	if (ret < 0)
 		logError( "Internal error: config reader supplied incomplete data\n" );
--- trunk/KDE/kdebase/workspace/kdm/backend/session.c #730279:730280
@@ -231,7 +231,8 @@
 ctrlGreeterWait( int wreply )
 {
 	int i, cmd, type, rootok;
-	char *name, *pass, **avptr;
+	char *name, *pass;
+	void **avptr;
 #ifdef XDMCP
 	ARRAY8Ptr aptr;
 #endif
@@ -294,7 +295,7 @@
 					break;
 				case C_TYPE_STR:
 					/*debug( " -> string %\"s\n", *avptr );*/
-					gSendStr( *avptr );
+					gSendStr( *(char **)avptr );
 					break;
 				case C_TYPE_ARGV:
 					/*debug( " -> sending argv %\"[{s\n", *(char ***)avptr );*/
--- trunk/KDE/kdebase/workspace/kdm/confproc.pl #730279:730280
@@ -434,7 +434,7 @@
                 $ov_loc_defs{$ctype} .= " \\\n\t".$oa[1][0];
               } else {
                 my @oa = (
-                  [ "{ ".$kid.", (char **) &".$hvn." },", "GLOB" ],
+                  [ "{ ".$kid.", &".$hvn." },", "GLOB" ],
                   [ $ctype.$hvn.";", "GDEF" ],
                   [ "extern ".$ctype.$hvn.";", "GDECL" ]
                 );
[prev in list] [next in list] [prev in thread] [next in thread]