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

kdrive: Fix const cast warnings in arguments processing. 

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
This commit is contained in:
Eric Anholt 2013-08-17 14:36:09 +02:00
parent 7107937e47
commit 77c7a2014e
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/kdrive/ephyr/ephyrinit.c
View File

@ -45,7 +45,7 @@ extern KdPointerDriver LinuxEvdevMouseDriver;
extern KdKeyboardDriver LinuxEvdevKeyboardDriver; extern KdKeyboardDriver LinuxEvdevKeyboardDriver;
#endif #endif
void processScreenArg(char *screen_size, char *parent_id); void processScreenArg(const char *screen_size, char *parent_id);
void void
InitCard(char *name) InitCard(char *name)
@ -134,7 +134,7 @@ ddxUseMsg(void)
} }
void void
processScreenArg(char *screen_size, char *parent_id) processScreenArg(const char *screen_size, char *parent_id)
{ {
KdCardInfo *card; KdCardInfo *card;

2
hw/kdrive/ephyr/os.c
View File

@ -28,7 +28,7 @@
#endif #endif
#include "ephyr.h" #include "ephyr.h"
extern void processScreenArg(char *screen_size, char *parent_id); extern void processScreenArg(const char *screen_size, char *parent_id);
static int static int
EphyrInit(void) EphyrInit(void)

6
hw/kdrive/src/kdrive.c
View File

@ -246,8 +246,8 @@ ddxGiveUp(enum ExitCode error)
Bool kdDumbDriver; Bool kdDumbDriver;
Bool kdSoftCursor; Bool kdSoftCursor;
char * const char *
KdParseFindNext(char *cur, const char *delim, char *save, char *last) KdParseFindNext(const char *cur, const char *delim, char *save, char *last)
{ {
while (*cur && !strchr(delim, *cur)) { while (*cur && !strchr(delim, *cur)) {
*save++ = *cur++; *save++ = *cur++;
@ -282,7 +282,7 @@ KdSubRotation(Rotation a, Rotation b)
} }
void void
KdParseScreen(KdScreenInfo * screen, char *arg) KdParseScreen(KdScreenInfo * screen, const char *arg)
{ {
char delim; char delim;
char save[1024]; char save[1024];

9
hw/kdrive/src/kdrive.h
View File

@ -411,13 +411,14 @@ Rotation KdAddRotation(Rotation a, Rotation b);
Rotation KdSubRotation(Rotation a, Rotation b); Rotation KdSubRotation(Rotation a, Rotation b);
void void
KdParseScreen(KdScreenInfo * screen, char *arg); KdParseScreen(KdScreenInfo * screen, const char *arg);
KdPointerInfo *KdParsePointer(char *arg); KdPointerInfo *KdParsePointer(const char *arg);
KdKeyboardInfo *KdParseKeyboard(char *arg); KdKeyboardInfo *KdParseKeyboard(const char *arg);
char *KdParseFindNext(char *cur, const char *delim, char *save, char *last); const char *
KdParseFindNext(const char *cur, const char *delim, char *save, char *last);
void void
KdParseRgba(char *rgba); KdParseRgba(char *rgba);

4
hw/kdrive/src/kinput.c
View File

@ -1086,7 +1086,7 @@ KdParseKbdOptions(KdKeyboardInfo * ki)
} }
KdKeyboardInfo * KdKeyboardInfo *
KdParseKeyboard(char *arg) KdParseKeyboard(const char *arg)
{ {
char save[1024]; char save[1024];
char delim; char delim;
@ -1178,7 +1178,7 @@ KdParsePointerOptions(KdPointerInfo * pi)
} }
KdPointerInfo * KdPointerInfo *
KdParsePointer(char *arg) KdParsePointer(const char *arg)
{ {
char save[1024]; char save[1024];
char delim; char delim;