frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xdmcp.c: fix three small const warnings 

xdmcp.c:63:36: warning: initialization discards qualifiers from pointer target type

xdmcp.c: In function 'XdmcpRegisterConnection':
xdmcp.c:482:8: warning: cast discards qualifiers from pointer target type
xdmcp.c:482:8: warning: cast discards qualifiers from pointer target type
xdmcp.c:482:8: warning: cast discards qualifiers from pointer target type

xdmcp.c: In function 'get_mcast_options':
xdmcp.c:1596:21: warning: initialization discards qualifiers from pointer target type

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Alan Coopersmith 2011-12-12 16:49:33 -08:00
parent 3839d14808
commit 83ac9502ea
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
os/xdmcp.c
View File

@ -60,7 +60,7 @@
#define X_INCLUDE_NETDB_H #define X_INCLUDE_NETDB_H
#include <X11/Xos_r.h> #include <X11/Xos_r.h>
static char *defaultDisplayClass = COMPILEDDISPLAYCLASS; static const char *defaultDisplayClass = COMPILEDDISPLAYCLASS;
static int xdmcpSocket, sessionSocket; static int xdmcpSocket, sessionSocket;
static xdmcp_states state; static xdmcp_states state;
@ -479,7 +479,7 @@ XdmcpRegisterConnection (
if (SOCKADDR_FAMILY(FromAddress) == AF_INET6) { if (SOCKADDR_FAMILY(FromAddress) == AF_INET6) {
fromAddr = &((struct sockaddr_in6 *)&FromAddress)->sin6_addr; fromAddr = &((struct sockaddr_in6 *)&FromAddress)->sin6_addr;
} else if ((SOCKADDR_FAMILY(FromAddress) == AF_INET) && } else if ((SOCKADDR_FAMILY(FromAddress) == AF_INET) &&
IN6_IS_ADDR_V4MAPPED((struct in6_addr *) address)) { IN6_IS_ADDR_V4MAPPED((const struct in6_addr *) address)) {
fromAddr = &((struct sockaddr_in *)&FromAddress)->sin_addr; fromAddr = &((struct sockaddr_in *)&FromAddress)->sin_addr;
regAddr = &((struct sockaddr_in6 *)&address)->sin6_addr.s6_addr[12]; regAddr = &((struct sockaddr_in6 *)&address)->sin6_addr.s6_addr[12];
regAddrlen = sizeof(struct in_addr); regAddrlen = sizeof(struct in_addr);
@ -1593,7 +1593,7 @@ get_fromaddr_by_name(
static int static int
get_mcast_options(int argc, char **argv, int i) get_mcast_options(int argc, char **argv, int i)
{ {
char *address = XDM_DEFAULT_MCAST_ADDR6; const char *address = XDM_DEFAULT_MCAST_ADDR6;
int hopcount = 1; int hopcount = 1;
struct addrinfo hints; struct addrinfo hints;
char portstr[6]; char portstr[6];