diff options
author | Cyril Brulebois <kibi@debian.org> | 2011-05-25 04:00:12 -0700 |
---|---|---|
committer | Aaron Plattner <aplattner@nvidia.com> | 2011-05-26 08:15:41 -0700 |
commit | 0796c3ad0dc1a2a0e42ca3b2c7b0cfd4016fc9e4 (patch) | |
tree | d097a98eb5a56c5a5a82a6f14046a8ad765a8dbc /xts5/include | |
parent | 35f6e2daf13a2d4430cc778a1bb5b382255fd404 (diff) |
xts5: Fix missing type specifiers.
Use void when nothing is actually returned, use int otherwise.
Also update the appropriate header for the void ones. Even though a
comment claims this header is generated automatically from the source
files, that doesn't seem to be the case.
The following warning go away accordingly:
| CC checkevent.lo
| checkevent.c:664:1: warning: type specifier missing, defaults to 'int' [-Wimplicit-int]
| check_ext_event(good,ev)
| ^~~~~~~~~~~~~~~
| CC devcntl.lo
| devcntl.c:401:1: warning: type specifier missing, defaults to 'int' [-Wimplicit-int]
| devicerelkeys(dev)
| ^~~~~~~~~~~~~
| devcntl.c:537:1: warning: type specifier missing, defaults to 'int' [-Wimplicit-int]
| modpress(disp, mask)
| ^~~~~~~~
| devcntl.c:545:1: warning: type specifier missing, defaults to 'int' [-Wimplicit-int]
| devmodpress(disp, dev, mask)
| ^~~~~~~~~~~
| devcntl.c:559:1: warning: type specifier missing, defaults to 'int' [-Wimplicit-int]
| modrel(disp, mask)
| ^~~~~~
| devcntl.c:567:1: warning: type specifier missing, defaults to 'int' [-Wimplicit-int]
| devmodrel(disp, dev, mask)
| ^~~~~~~~~
| devcntl.c:644:1: warning: type specifier missing, defaults to 'int' [-Wimplicit-int]
| ismodkey(mask, kc)
| ^~~~~~~~
| devcntl.c:669:1: warning: type specifier missing, defaults to 'int' [-Wimplicit-int]
| restoredevstate()
| ^~~~~~~~~~~~~~~
| devcntl.c:681:1: warning: type specifier missing, defaults to 'int' [-Wimplicit-int]
| noext(needbutton)
| ^~~~~
| devcntl.c:703:1: warning: type specifier missing, defaults to 'int' [-Wimplicit-int]
| nbuttons()
| ^~~~~~~~
| devcntl.c:718:1: warning: type specifier missing, defaults to 'int' [-Wimplicit-int]
| getkeycode(display)
| ^~~~~~~~~~
| devcntl.c:741:1: warning: type specifier missing, defaults to 'int' [-Wimplicit-int]
| getdevkeycode(display,dev)
| ^~~~~~~~~~~~~
| CC pfcount.lo
| pfcount.c:118:1: waning: type specifier missing, defaults to 'int' [-Wimplicit-int]
| pfcount(pass, fail)
| ^~~~~~~
| pfcount.c:126:1: waning: type specifier missing, defaults to 'int' [-Wimplicit-int]
| rptcounts()
| ^~~~~~~~~
| CC regid.lo
| regid.c:312:1: waning: type specifier missing, defaults to 'int' [-Wimplicit-int]
| regenable()
| ^~~~~~~~~
| regid.c:316:1: waning: type specifier missing, defaults to 'int' [-Wimplicit-int]
| regdisable()
| ^~~~~~~~~~
| CC checkfont.lo
| checkfont.c:155:8: warning: type specifier missing, defaults to 'int' [-Wimplicit-int]
| static check1prop(XFontStruct *fsp, XFontProp *fp, char *str);
| ~~~~~~ ^
| checkfont.c:451:1: warning: type specifier missing, defaults to 'int' [-Wimplicit-int]
| check1prop(fsp, fp, str)
| ^
| CC cursor.lo
| cursor.c:123:1: warning: type specifier missing, defaults to 'int' [-Wimplicit-int]
| curofwin(display, cursor, window)
| ^~~~~~~~
| cursor.c:133:1: warning: type specifier missing, defaults to 'int' [-Wimplicit-int]
| defcur(display, window)
| ^~~~~~
| cursor.c:165:1: warning: type specifier missing, defaults to 'int' [-Wimplicit-int]
| spriteiswin(display, window)
| ^~~~~~~~~~~
Signed-off-by: Cyril Brulebois <kibi@debian.org>
[aplattner@nvidia.com: Squashed a few similar commits]
Tested-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Diffstat (limited to 'xts5/include')
-rw-r--r-- | xts5/include/xtlibproto.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xts5/include/xtlibproto.h b/xts5/include/xtlibproto.h index d2765195..fdfd443d 100644 --- a/xts5/include/xtlibproto.h +++ b/xts5/include/xtlibproto.h @@ -254,8 +254,8 @@ Pixmap nondepth1pixmap( Display *disp, Drawable d); void setfuncpixel(Display *disp, Drawable drw, int *xp, int *yp); void regid(Display *disp, union regtypes *id, int type); void freereg(void); -int regenable(void); -int regdisable(void); +void regenable(void); +void regdisable(void); void openfonts(Font fonts[], int nfonts); int checkfsp(XFontStruct *fsp, XFontStruct *good, char *str); void txtextents(XFontStruct *fsp, unsigned char *str, int n, int *dir, int *ascent, int *descent, XCharStruct *overall); @@ -321,8 +321,8 @@ void settimeout(int to); unsigned long cleartimeout(void); Region makeregion(void); int samehost(XHostAddress *h1, XHostAddress *h2); -int pfcount(int pass, int fail); -int rptcounts(void); +void pfcount(int pass, int fail); +void rptcounts(void); Status SimulateKeyPressEvent(Display *dpy, KeyCode keycode); Status SimulateKeyReleaseEvent(Display *dpy, KeyCode keycode); Status SimulateButtonPressEvent(Display *dpy, unsigned int button); @@ -341,10 +341,10 @@ void relbuttons(void); void relkeys(void); void relalldev(void); unsigned int wantmods(Display *disp, int want); -int modpress(Display *disp, unsigned int mask); -int modrel(Display *disp, unsigned int mask); +void modpress(Display *disp, unsigned int mask); +void modrel(Display *disp, unsigned int mask); int ismodkey(unsigned int mask, int kc); -int restoredevstate(void); +void restoredevstate(void); int noext(int needbutton); int nbuttons(void); int getkeycode(Display *display); |