Skip to content

N
nx-libs
Commit a2741452 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

hw/nxagent/Events.c: Fix compiler warnings (with NX_DEBUG_INPUT): format.

Events.c: In function 'nxagentDumpInputDevicesState': Events.c:4662:58: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'DeviceIntPtr {aka struct _DeviceIntRec *}' [-Wformat=] fprintf(stderr, "\nKeyboard device state: \n\tdevice [%p]\n\tlast grab time [%lu]" ^ Events.c:4662:82: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'CARD32 {aka unsigned int}' [-Wformat=] fprintf(stderr, "\nKeyboard device state: \n\tdevice [%p]\n\tlast grab time [%lu]" ^ Events.c:4662:19: warning: format '%p' expects argument of type 'void *', but argument 7 has type 'GrabPtr {aka struct _GrabRec *}' [-Wformat=] fprintf(stderr, "\nKeyboard device state: \n\tdevice [%p]\n\tlast grab time [%lu]" ^ Events.c:4675:66: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'WindowPtr {aka struct _Window *}' [-Wformat=] fprintf(stderr, "\nKeyboard grab state: \n\twindow pointer [%p]" ^ Events.c:4689:59: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'DeviceIntPtr {aka struct _DeviceIntRec *}' [-Wformat=] fprintf(stderr, "\nPassive grab state: \n\tdevice [%p]\n\towner events flag [%s]" ^ Events.c:4689:23: warning: format '%lx' expects argument of type 'long unsigned int', but argument 10 has type 'Mask {aka unsigned int}' [-Wformat=] fprintf(stderr, "\nPassive grab state: \n\tdevice [%p]\n\towner events flag [%s]" ^ Events.c:4722:57: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'DeviceIntPtr {aka struct _DeviceIntRec *}' [-Wformat=] fprintf(stderr, "\nPointer device state: \n\tdevice [%p]\n\tlast grab time [%lu]" ^ Events.c:4722:81: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'CARD32 {aka unsigned int}' [-Wformat=] fprintf(stderr, "\nPointer device state: \n\tdevice [%p]\n\tlast grab time [%lu]" ^ Events.c:4722:19: warning: format '%p' expects argument of type 'void *', but argument 7 has type 'GrabPtr {aka struct _GrabRec *}' [-Wformat=] fprintf(stderr, "\nPointer device state: \n\tdevice [%p]\n\tlast grab time [%lu]" ^ Events.c:4735:65: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'WindowPtr {aka struct _Window *}' [-Wformat=] fprintf(stderr, "\nPointer grab state: \n\twindow pointer [%p]" ^ Events.c:4750:61: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'DeviceIntPtr {aka struct _DeviceIntRec *}' [-Wformat=] fprintf(stderr, "\nPassive grab state: \n\tdevice [%p]\n\towner events flag [%s]" ^ Events.c:4750:25: warning: format '%lx' expects argument of type 'long unsigned int', but argument 10 has type 'Mask {aka unsigned int}' [-Wformat=] fprintf(stderr, "\nPassive grab state: \n\tdevice [%p]\n\towner events flag [%s]" ^
parent 7aed70f1
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
nx-X11/programs/Xserver/hw/nxagent/Events.c
View file @ a2741452
...@@ -4664,12 +4664,12 @@ void nxagentDumpInputDevicesState(void) ...@@ -4664,12 +4664,12 @@ void nxagentDumpInputDevicesState(void)
} }
} }
fprintf(stderr, "\nKeyboard device state: \n\tdevice [%p]\n\tlast grab time [%lu]" fprintf(stderr, "\nKeyboard device state: \n\tdevice [%p]\n\tlast grab time [%u]"
"\n\tfrozen [%s]\n\tstate [%s]\n\tother [%p]\n\tevent count [%d]" "\n\tfrozen [%s]\n\tstate [%s]\n\tother [%p]\n\tevent count [%d]"
"\n\tfrom passive grab [%s]\n\tactivating key [%d]", dev, "\n\tfrom passive grab [%s]\n\tactivating key [%d]", (void *)dev,
dev -> grabTime.milliseconds, dev -> sync.frozen ? "Yes": "No", dev -> grabTime.milliseconds, dev -> sync.frozen ? "Yes": "No",
nxagentGrabStateToString(dev -> sync.state), nxagentGrabStateToString(dev -> sync.state),
dev -> sync.other, dev -> sync.evcount, (void *)dev -> sync.other, dev -> sync.evcount,
dev -> fromPassiveGrab ? "Yes" : "No", dev -> fromPassiveGrab ? "Yes" : "No",
dev -> activatingKey); dev -> activatingKey);
...@@ -4679,7 +4679,7 @@ void nxagentDumpInputDevicesState(void) ...@@ -4679,7 +4679,7 @@ void nxagentDumpInputDevicesState(void)
{ {
fprintf(stderr, "\nKeyboard grab state: \n\twindow pointer [%p]" fprintf(stderr, "\nKeyboard grab state: \n\twindow pointer [%p]"
"\n\towner events flag [%s]\n\tgrab mode [%s]", "\n\towner events flag [%s]\n\tgrab mode [%s]",
grab -> window, grab -> ownerEvents ? "True" : "False", (void *)grab -> window, grab -> ownerEvents ? "True" : "False",
grab -> keyboardMode ? "asynchronous" : "synchronous"); grab -> keyboardMode ? "asynchronous" : "synchronous");
/* /*
...@@ -4693,8 +4693,8 @@ void nxagentDumpInputDevicesState(void) ...@@ -4693,8 +4693,8 @@ void nxagentDumpInputDevicesState(void)
{ {
fprintf(stderr, "\nPassive grab state: \n\tdevice [%p]\n\towner events flag [%s]" fprintf(stderr, "\nPassive grab state: \n\tdevice [%p]\n\towner events flag [%s]"
"\n\tpointer grab mode [%s]\n\tkeyboard grab mode [%s]\n\tevent type [%d]" "\n\tpointer grab mode [%s]\n\tkeyboard grab mode [%s]\n\tevent type [%d]"
"\n\tmodifiers [%x]\n\tbutton/key [%u]\n\tevent mask [%lx]", "\n\tmodifiers [%x]\n\tbutton/key [%u]\n\tevent mask [%x]",
grab -> device, grab -> ownerEvents ? "True" : "False", (void *)grab -> device, grab -> ownerEvents ? "True" : "False",
grab -> pointerMode ? "asynchronous" : "synchronous", grab -> pointerMode ? "asynchronous" : "synchronous",
grab -> keyboardMode ? "asynchronous" : "synchronous", grab -> keyboardMode ? "asynchronous" : "synchronous",
grab -> type, grab -> modifiersDetail.exact, grab -> type, grab -> modifiersDetail.exact,
...@@ -4724,12 +4724,12 @@ void nxagentDumpInputDevicesState(void) ...@@ -4724,12 +4724,12 @@ void nxagentDumpInputDevicesState(void)
} }
} }
fprintf(stderr, "\nPointer device state: \n\tdevice [%p]\n\tlast grab time [%lu]" fprintf(stderr, "\nPointer device state: \n\tdevice [%p]\n\tlast grab time [%u]"
"\n\tfrozen [%s]\n\tstate [%s]\n\tother [%p]\n\tevent count [%d]" "\n\tfrozen [%s]\n\tstate [%s]\n\tother [%p]\n\tevent count [%d]"
"\n\tfrom passive grab [%s]\n\tactivating button [%d]", dev, "\n\tfrom passive grab [%s]\n\tactivating button [%d]", (void *)dev,
dev -> grabTime.milliseconds, dev -> sync.frozen ? "Yes" : "No", dev -> grabTime.milliseconds, dev -> sync.frozen ? "Yes" : "No",
nxagentGrabStateToString(dev -> sync.state), nxagentGrabStateToString(dev -> sync.state),
dev -> sync.other, dev -> sync.evcount, (void *)dev -> sync.other, dev -> sync.evcount,
dev -> fromPassiveGrab ? "Yes" : "No", dev -> fromPassiveGrab ? "Yes" : "No",
dev -> activatingKey); dev -> activatingKey);
...@@ -4739,7 +4739,7 @@ void nxagentDumpInputDevicesState(void) ...@@ -4739,7 +4739,7 @@ void nxagentDumpInputDevicesState(void)
{ {
fprintf(stderr, "\nPointer grab state: \n\twindow pointer [%p]" fprintf(stderr, "\nPointer grab state: \n\twindow pointer [%p]"
"\n\towner events flag [%s]\n\tgrab mode [%s]", "\n\towner events flag [%s]\n\tgrab mode [%s]",
grab -> window, grab -> ownerEvents ? "True" : "False", (void *)grab -> window, grab -> ownerEvents ? "True" : "False",
grab -> pointerMode ? "asynchronous" : "synchronous"); grab -> pointerMode ? "asynchronous" : "synchronous");
if (grab -> window != pWin) if (grab -> window != pWin)
...@@ -4754,8 +4754,8 @@ void nxagentDumpInputDevicesState(void) ...@@ -4754,8 +4754,8 @@ void nxagentDumpInputDevicesState(void)
{ {
fprintf(stderr, "\nPassive grab state: \n\tdevice [%p]\n\towner events flag [%s]" fprintf(stderr, "\nPassive grab state: \n\tdevice [%p]\n\towner events flag [%s]"
"\n\tpointer grab mode [%s]\n\tkeyboard grab mode [%s]\n\tevent type [%d]" "\n\tpointer grab mode [%s]\n\tkeyboard grab mode [%s]\n\tevent type [%d]"
"\n\tmodifiers [%x]\n\tbutton/key [%u]\n\tevent mask [%lx]", "\n\tmodifiers [%x]\n\tbutton/key [%u]\n\tevent mask [%x]",
grab -> device, grab -> ownerEvents ? "True" : "False", (void *)grab -> device, grab -> ownerEvents ? "True" : "False",
grab -> pointerMode ? "asynchronous" : "synchronous", grab -> pointerMode ? "asynchronous" : "synchronous",
grab -> keyboardMode ? "asynchronous" : "synchronous", grab -> keyboardMode ? "asynchronous" : "synchronous",
grab -> type, grab -> modifiersDetail.exact, grab -> type, grab -> modifiersDetail.exact,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment