diff options
author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-13 20:24:16 -0200 |
---|---|---|
committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-13 20:24:16 -0200 |
commit | e0c50fd64a739a53da72efe03f0a5e6aedf9d0da (patch) | |
tree | 8e2e1d330e2b550eb6a566592a32b224654fa86a /xtrapchar.c | |
parent | 19af61149a8dd650dac2a636c6bffb1fd7aab43b (diff) |
Ansification and compile warning fixes.
This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, and corrects
make distcheck.
Only remaining sparse warning(s) are in the format:
xtrapout.c:268:35: warning: incorrect type in argument 3 (different argument counts)
xtrapout.c:268:35: expected void ( *[usertype] func )( ... )
xtrapout.c:268:35: got void ( static [toplevel] *<noident> )( ... )
and so on. And these warnings are correct, as the callback prototypes
in X11/extensions/xtraplibp.h have a different prototype (apparently
code in xtrapout.c was never update for library changes...).
Diffstat (limited to 'xtrapchar.c')
-rw-r--r-- | xtrapchar.c | 42 |
1 files changed, 17 insertions, 25 deletions
diff --git a/xtrapchar.c b/xtrapchar.c index 06b9400..a707623 100644 --- a/xtrapchar.c +++ b/xtrapchar.c @@ -134,9 +134,9 @@ static BOOL passive_ctrl; /* Control key assumed? */ static BOOL shift; /* Cap's on? */ static BOOL ctrl; /* Control key? */ static BOOL alt; /* Alt key? */ -KeyCode alt_code; -KeyCode ctrl_code; -KeyCode shift_code; +static KeyCode alt_code; +static KeyCode ctrl_code; +static KeyCode shift_code; @@ -236,7 +236,7 @@ main(int argc, char *argv[]) { printf("Display: %s \n", DisplayString(dpy)); } - if ((tc = XECreateTC(dpy,0L, NULL)) == False) + if ((tc = XECreateTC(dpy,0L, NULL)) == NULL) { fprintf(stderr,"%s: could not initialize XTrap extension\n", ProgName); exit (1L); @@ -368,12 +368,10 @@ main(int argc, char *argv[]) exit(0L); } -static int get_csi_key(tc, private, param, nparam, inter, ninter, final) - XETC *tc; - int private; - int param[], nparam; - int inter[], ninter; - int final; +static int get_csi_key(XETC *tc, int private, + int param[], int nparam, + int inter[], int ninter, + int final) { KeySym keysym = 0; switch(param[1]) @@ -445,12 +443,10 @@ static int get_csi_key(tc, private, param, nparam, inter, ninter, final) * pointer position) * */ -static void send_special(tc, private, param, nparam, inter, ninter, final) - XETC *tc; - int private; - int param[], nparam; - int inter[], ninter; - int final; +static void send_special(XETC *tc, int private, + int param[], int nparam, + int inter[], int ninter, + int final) { switch(private) { @@ -619,12 +615,10 @@ static void send_special(tc, private, param, nparam, inter, ninter, final) } } -static int get_ss3_key(tc, private, param, nparam, inter, ninter, final) - XETC *tc; - int private; - int param[], nparam; - int inter[], ninter; - int final; +static int get_ss3_key(XETC *tc, int private, + int param[], int nparam, + int inter[], int ninter, + int final) { KeySym keysym = 0; switch(param[1]) @@ -665,9 +659,7 @@ static int get_ss3_key(tc, private, param, nparam, inter, ninter, final) return(get_keycode(tc, keysym)); } -static KeyCode get_typical_char(tc, keysym) - XETC *tc; - CARD32 keysym; +static KeyCode get_typical_char(XETC *tc, CARD32 keysym) { if (iscntrl(keysym)) { |