diff options
| author | Keith Packard <keithp@keithp.com> | 2013-11-15 21:57:05 +0900 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-01-12 10:14:49 -0800 |
| commit | d89b42bda46d36fc0879611cc3b3566957ce36d0 (patch) | |
| tree | fdbf1dc37a86b98e63ca5235506e5ff1f90e6b28 /dix/globals.c | |
| parent | d6da9f23cca562fc0c6ae398665ab7fa770a4fa8 (diff) | |
Clean up warnings in DIX
As usual, mostly const char changes. However, filter_device_events had
a potentially uninitialized value, 'raw', which I added a bunch of
checks for. I suspect most of those are 'can't happen', but it's hard
to see that inside the function.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'dix/globals.c')
| -rw-r--r-- | dix/globals.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dix/globals.c b/dix/globals.c index ad9145b01..9738e9cdf 100644 --- a/dix/globals.c +++ b/dix/globals.c @@ -112,9 +112,9 @@ int defaultScreenSaverAllowExposures = DEFAULT_SCREEN_SAVER_EXPOSURES; Bool screenSaverSuspended = FALSE; #endif -char *defaultFontPath = COMPILEDDEFAULTFONTPATH; -char *defaultTextFont = COMPILEDDEFAULTFONT; -char *defaultCursorFont = COMPILEDCURSORFONT; +const char *defaultFontPath = COMPILEDDEFAULTFONTPATH; +const char *defaultTextFont = COMPILEDDEFAULTFONT; +const char *defaultCursorFont = COMPILEDCURSORFONT; FontPtr defaultFont; /* not declared in dix.h to avoid including font.h in every compilation of dix code */ CursorPtr rootCursor; @@ -126,7 +126,7 @@ TimeStamp currentTime; int defaultColorVisualClass = -1; int monitorResolution = 0; -char *display; +const char *display; int displayfd; char *ConnectionInfo; |