diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-13 20:10:23 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-13 20:10:23 -0200 |
| commit | 3a041bbccdee28b628ce5243e77d7d3125a186d4 (patch) | |
| tree | 522e1d212db0b5732fb6c3514a9f7144728527c7 /xdpyinfo.c | |
| parent | 0fbda267334eb531b7153c3b9035fe7470302e13 (diff) | |
Ansification and compile warning fixes.
This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, and corrects
make distcheck.
Diffstat (limited to 'xdpyinfo.c')
| -rw-r--r-- | xdpyinfo.c | 17 |
1 files changed, 9 insertions, 8 deletions
@@ -132,8 +132,8 @@ in this Software without prior written authorization from The Open Group. /* Turn a NULL pointer string into an empty string */ #define NULLSTR(x) (((x)!=NULL)?(x):("")) -char *ProgramName; -Bool queryExtensions = False; +static char *ProgramName; +static Bool queryExtensions = False; static int silent_errors(Display *dpy, XErrorEvent *ev) @@ -725,7 +725,8 @@ print_shape_info(Display *dpy, char *extname) static int print_dga_info(Display *dpy, char *extname) { - int majorrev, minorrev, width, bank, ram, offset, flags; + unsigned int offset; + int majorrev, minorrev, width, bank, ram, flags; if (!XF86DGAQueryVersion(dpy, &majorrev, &minorrev)) return 0; @@ -849,14 +850,14 @@ print_XF86VidMode_info(Display *dpy, char *extname) #ifdef XF86MISC -char *kbdtable[] = { "Unknown", "84-key", "101-key", "Other", "Xqueue" }; -char *msetable[] = { "None", "Microsoft", "MouseSystems", "MMSeries", +static char *kbdtable[] = { "Unknown", "84-key", "101-key", "Other", "Xqueue" }; +static char *msetable[] = { "None", "Microsoft", "MouseSystems", "MMSeries", "Logitech", "BusMouse", "Mouseman", "PS/2", "MMHitTab", "GlidePoint", "IntelliMouse", "ThinkingMouse", "IMPS/2", "ThinkingMousePS/2", "MouseManPlusPS/2", "GlidePointPS/2", "NetMousePS/2", "NetScrollPS/2", "SysMouse", "Auto" }; -char *flgtable[] = { "None", "ClearDTR", "ClearRTS", +static char *flgtable[] = { "None", "ClearDTR", "ClearRTS", "ClearDTR and ClearRTS" }; static int @@ -1411,7 +1412,7 @@ typedef struct { Bool printit; } ExtensionPrintInfo; -ExtensionPrintInfo known_extensions[] = +static ExtensionPrintInfo known_extensions[] = { #ifdef MITSHM {"MIT-SHM", print_mitshm_info, False}, @@ -1454,7 +1455,7 @@ ExtensionPrintInfo known_extensions[] = /* add new extensions here */ }; -int num_known_extensions = sizeof known_extensions / sizeof known_extensions[0]; +static int num_known_extensions = sizeof known_extensions / sizeof known_extensions[0]; static void print_known_extensions(FILE *f) |