Skip to content

N
nx-libs
Commit 15bfec7a authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

Keyboard.c: Use __func__ at fprintf calls

parent 4c8568ca
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 51 deletions
nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
View file @ 15bfec7a
...@@ -250,7 +250,7 @@ CARD8 nxagentConvertKeycode(CARD8 k) ...@@ -250,7 +250,7 @@ CARD8 nxagentConvertKeycode(CARD8 k)
{ {
#ifdef DEBUG #ifdef DEBUG
if (k != nxagentConvertedKeycodes[k]) if (k != nxagentConvertedKeycodes[k])
fprintf(stderr, "nxagentConvertKeycode: converting keycode [%d] to [%d]\n", k, nxagentConvertedKeycodes[k]); fprintf(stderr, "%s: converting keycode [%d] to [%d]\n", __func__, k, nxagentConvertedKeycodes[k]);
#endif #endif
return nxagentConvertedKeycodes[k]; return nxagentConvertedKeycodes[k];
...@@ -292,7 +292,7 @@ void nxagentChangeKeyboardControl(DeviceIntPtr pDev, KeybdCtrl *ctrl) ...@@ -292,7 +292,7 @@ void nxagentChangeKeyboardControl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
*/ */
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentChangeKeyboardControl: Repeat delay was [%d] interval was [%d].\n", fprintf(stderr, "%s: Repeat delay was [%d] interval was [%d].\n", __func__,
xkbc -> repeat_delay, xkbc -> repeat_interval); xkbc -> repeat_delay, xkbc -> repeat_interval);
#endif #endif
...@@ -300,7 +300,7 @@ void nxagentChangeKeyboardControl(DeviceIntPtr pDev, KeybdCtrl *ctrl) ...@@ -300,7 +300,7 @@ void nxagentChangeKeyboardControl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
xkbc -> repeat_interval = ~ 0; xkbc -> repeat_interval = ~ 0;
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentChangeKeyboardControl: Repeat delay is now [%d] interval is now [%d].\n", fprintf(stderr, "%s: Repeat delay is now [%d] interval is now [%d].\n", __func__,
xkbc -> repeat_delay, xkbc -> repeat_interval); xkbc -> repeat_delay, xkbc -> repeat_interval);
#endif #endif
} }
...@@ -318,7 +318,7 @@ void nxagentChangeKeyboardControl(DeviceIntPtr pDev, KeybdCtrl *ctrl) ...@@ -318,7 +318,7 @@ void nxagentChangeKeyboardControl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
XKeyboardControl values; XKeyboardControl values;
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentChangeKeyboardControl: WARNING! Propagating changes to keyboard settings.\n"); fprintf(stderr, "%s: WARNING! Propagating changes to keyboard settings.\n", __func__);
#endif #endif
value_mask = KBKeyClickPercent | value_mask = KBKeyClickPercent |
...@@ -363,7 +363,7 @@ void nxagentChangeKeyboardControl(DeviceIntPtr pDev, KeybdCtrl *ctrl) ...@@ -363,7 +363,7 @@ void nxagentChangeKeyboardControl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
} }
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentChangeKeyboardControl: WARNING! Not propagating changes to keyboard settings.\n"); fprintf(stderr, "%s: WARNING! Not propagating changes to keyboard settings.\n", __func__);
#endif #endif
} }
...@@ -387,7 +387,7 @@ int nxagentKeyboardProc(DeviceIntPtr pDev, int onoff) ...@@ -387,7 +387,7 @@ int nxagentKeyboardProc(DeviceIntPtr pDev, int onoff)
case DEVICE_INIT: case DEVICE_INIT:
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentKeyboardProc: Called for [DEVICE_INIT].\n"); fprintf(stderr, "%s: Called for [DEVICE_INIT].\n", __func__);
#endif #endif
if (NXDisplayError(nxagentDisplay) == 1) if (NXDisplayError(nxagentDisplay) == 1)
...@@ -397,7 +397,7 @@ int nxagentKeyboardProc(DeviceIntPtr pDev, int onoff) ...@@ -397,7 +397,7 @@ int nxagentKeyboardProc(DeviceIntPtr pDev, int onoff)
#ifdef WATCH #ifdef WATCH
fprintf(stderr, "nxagentKeyboardProc: Watchpoint 9.\n"); fprintf(stderr, "%s: Watchpoint 9.\n", __func__);
/* /*
Reply Total Cached Bits In Bits Out Bits/Reply Ratio Reply Total Cached Bits In Bits Out Bits/Reply Ratio
...@@ -421,7 +421,7 @@ N/A ...@@ -421,7 +421,7 @@ N/A
XkbDfltRepeatInterval = ~ 0; XkbDfltRepeatInterval = ~ 0;
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentKeyboardProc: Set repeat delay to [%d] interval to [%d].\n", fprintf(stderr, "%s: Set repeat delay to [%d] interval to [%d].\n", __func__,
XkbDfltRepeatDelay, XkbDfltRepeatInterval); XkbDfltRepeatDelay, XkbDfltRepeatInterval);
#endif #endif
...@@ -517,13 +517,13 @@ N/A ...@@ -517,13 +517,13 @@ N/A
if (noXkbExtension) { if (noXkbExtension) {
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentKeyboardProc: No XKB extension.\n"); fprintf(stderr, "%s: No XKB extension.\n", __func__);
#endif #endif
XkbError: XkbError:
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentKeyboardProc: XKB error.\n"); fprintf(stderr, "%s: XKB error.\n", __func__);
#endif #endif
#endif #endif
...@@ -540,7 +540,7 @@ XkbError: ...@@ -540,7 +540,7 @@ XkbError:
nxagentBell, nxagentChangeKeyboardControl); nxagentBell, nxagentChangeKeyboardControl);
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentKeyboardProc: InitKeyboardDeviceStruct returns [%d].\n", ret); fprintf(stderr, "%s: InitKeyboardDeviceStruct returns [%d].\n", __func__, ret);
} }
#endif #endif
...@@ -556,8 +556,8 @@ XkbError: ...@@ -556,8 +556,8 @@ XkbError:
} }
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentKeyboardProc: Using XKB extension.\n"); fprintf(stderr, "%s: Using XKB extension.\n", __func__);
fprintf(stderr, "nxagentKeyboardProc: nxagentKeyboard is [%s].\n", nxagentKeyboard ? nxagentKeyboard : "NULL"); fprintf(stderr, "%s: nxagentKeyboard is [%s].\n", __func__, validateString(nxagentKeyboard));
#endif #endif
if (nxagentX2go && nxagentKeyboard && (strcmp(nxagentKeyboard, "null/null") == 0)) if (nxagentX2go && nxagentKeyboard && (strcmp(nxagentKeyboard, "null/null") == 0))
...@@ -635,8 +635,8 @@ XkbError: ...@@ -635,8 +635,8 @@ XkbError:
if (strcmp(model, "pc105") == 0) if (strcmp(model, "pc105") == 0)
{ {
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentKeyboardProc: WARNING! Keyboard model 'pc105' unsupported on Solaris.\n"); fprintf(stderr, "%s: WARNING! Keyboard model 'pc105' unsupported on Solaris.\n", __func__);
fprintf(stderr, "nxagentKeyboardProc: WARNING! Forcing keyboard model to 'pc104'.\n"); fprintf(stderr, "%s: WARNING! Forcing keyboard model to 'pc104'.\n", __func__);
#endif #endif
strcpy(model, "pc104"); strcpy(model, "pc104");
...@@ -647,13 +647,13 @@ XkbError: ...@@ -647,13 +647,13 @@ XkbError:
else else
{ {
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentKeyboardProc: Using default keyboard: model [%s] layout [%s].\n", fprintf(stderr, "%s: Using default keyboard: model [%s] layout [%s].\n", __func__,
model?model:"(default)", layout?layout:"(default)"); model?model:"(default)", layout?layout:"(default)");
#endif #endif
} }
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentKeyboardProc: Init XKB extension.\n"); fprintf(stderr, "%s: Init XKB extension.\n", __func__);
#endif #endif
if (nxagentRemoteRules && nxagentRemoteModel) if (nxagentRemoteRules && nxagentRemoteModel)
...@@ -720,13 +720,13 @@ XkbError: ...@@ -720,13 +720,13 @@ XkbError:
#ifdef TEST #ifdef TEST
else else
{ {
fprintf(stderr, "nxagentKeyboardProc: No current keyboard.\n"); fprintf(stderr, "%s: No current keyboard.\n", __func__);
} }
#endif #endif
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "nxagentKeyboardProc: Going to set rules and init device: " fprintf(stderr, "%s: Going to set rules and init device: "
"[rules='%s',model='%s',layout='%s',variant='%s',options='%s'].\n", "[rules='%s',model='%s',layout='%s',variant='%s',options='%s'].\n", __func__,
rules?rules:"(default)", model?model:"(default)", layout?layout:"(default)", rules?rules:"(default)", model?model:"(default)", layout?layout:"(default)",
variant?variant:"(default)", options?options:"(default)"); variant?variant:"(default)", options?options:"(default)");
#endif #endif
...@@ -767,7 +767,7 @@ XkbError: ...@@ -767,7 +767,7 @@ XkbError:
#ifdef WATCH #ifdef WATCH
fprintf(stderr, "nxagentKeyboardProc: Watchpoint 10.\n"); fprintf(stderr, "%s: Watchpoint 10.\n", __func__);
/* /*
Reply Total Cached Bits In Bits Out Bits/Reply Ratio Reply Total Cached Bits In Bits Out Bits/Reply Ratio
...@@ -791,7 +791,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio ...@@ -791,7 +791,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
case DEVICE_ON: case DEVICE_ON:
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentKeyboardProc: Called for [DEVICE_ON].\n"); fprintf(stderr, "%s: Called for [DEVICE_ON].\n", __func__);
#endif #endif
if (NXDisplayError(nxagentDisplay) == 1) if (NXDisplayError(nxagentDisplay) == 1)
...@@ -801,7 +801,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio ...@@ -801,7 +801,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
#ifdef WATCH #ifdef WATCH
fprintf(stderr, "nxagentKeyboardProc: Watchpoint 11.\n"); fprintf(stderr, "%s: Watchpoint 11.\n", __func__);
/* /*
Reply Total Cached Bits In Bits Out Bits/Reply Ratio Reply Total Cached Bits In Bits Out Bits/Reply Ratio
...@@ -820,7 +820,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio ...@@ -820,7 +820,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
case DEVICE_OFF: case DEVICE_OFF:
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentKeyboardProc: Called for [DEVICE_OFF].\n"); fprintf(stderr, "%s: Called for [DEVICE_OFF].\n", __func__);
#endif #endif
if (NXDisplayError(nxagentDisplay) == 1) if (NXDisplayError(nxagentDisplay) == 1)
...@@ -834,7 +834,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio ...@@ -834,7 +834,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
case DEVICE_CLOSE: case DEVICE_CLOSE:
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentKeyboardProc: Called for [DEVICE_CLOSE].\n"); fprintf(stderr, "%s: Called for [DEVICE_CLOSE].\n", __func__);
#endif #endif
break; break;
...@@ -934,14 +934,14 @@ int nxagentResetKeyboard(void) ...@@ -934,14 +934,14 @@ int nxagentResetKeyboard(void)
savedBellDuration = inputInfo.keyboard -> kbdfeed -> ctrl.bell_duration; savedBellDuration = inputInfo.keyboard -> kbdfeed -> ctrl.bell_duration;
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentResetKeyboard: bellPercent [%d] bellPitch [%d] bellDuration [%d].\n", fprintf(stderr, "%s: bellPercent [%d] bellPitch [%d] bellDuration [%d].\n", __func__,
savedBellPercent, savedBellPitch, savedBellDuration); savedBellPercent, savedBellPitch, savedBellDuration);
#endif #endif
if (!(devBackup = calloc(1, sizeof(DeviceIntRec)))) if (!(devBackup = calloc(1, sizeof(DeviceIntRec))))
{ {
#ifdef PANIC #ifdef PANIC
fprintf(stderr, "nxagentResetKeyboard: PANIC! Can't allocate backup structure.\n"); fprintf(stderr, "%s: PANIC! Can't allocate backup structure.\n", __func__);
#endif #endif
} }
...@@ -992,7 +992,7 @@ int nxagentResetKeyboard(void) ...@@ -992,7 +992,7 @@ int nxagentResetKeyboard(void)
else else
{ {
#ifdef WARNING #ifdef WARNING
fprintf(stderr, "nxagentResetKeyboard: Can't initialize the keyboard device.\n"); fprintf(stderr, "%s: Can't initialize the keyboard device.\n", __func__);
#endif #endif
nxagentRestoreKeyboardDeviceData(devBackup, dev); nxagentRestoreKeyboardDeviceData(devBackup, dev);
...@@ -1046,9 +1046,8 @@ void nxagentCheckRemoteKeycodes(void) ...@@ -1046,9 +1046,8 @@ void nxagentCheckRemoteKeycodes(void)
nxagentNumLockKeycode = XKeysymToKeycode(nxagentDisplay, XK_Num_Lock); nxagentNumLockKeycode = XKeysymToKeycode(nxagentDisplay, XK_Num_Lock);
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "nxagentCheckRemoteKeycodes: Remote keycodes: CapsLock " fprintf(stderr, "%s: Remote keycodes: CapsLock [%d] NumLock [%d].\n", __func__,
"[%d] NumLock [%d].\n", nxagentCapsLockKeycode, nxagentCapsLockKeycode,nxagentNumLockKeycode);
nxagentNumLockKeycode);
#endif #endif
} }
...@@ -1057,7 +1056,7 @@ static int nxagentSaveKeyboardDeviceData(DeviceIntPtr dev, DeviceIntPtr devBacku ...@@ -1057,7 +1056,7 @@ static int nxagentSaveKeyboardDeviceData(DeviceIntPtr dev, DeviceIntPtr devBacku
if (!devBackup) if (!devBackup)
{ {
#ifdef PANIC #ifdef PANIC
fprintf(stderr, "nxagentSaveKeyboardDeviceData: PANIC! Pointer to backup structure is null.\n"); fprintf(stderr, "%s: PANIC! Pointer to backup structure is null.\n", __func__);
#endif #endif
return -1; return -1;
...@@ -1068,7 +1067,7 @@ static int nxagentSaveKeyboardDeviceData(DeviceIntPtr dev, DeviceIntPtr devBacku ...@@ -1068,7 +1067,7 @@ static int nxagentSaveKeyboardDeviceData(DeviceIntPtr dev, DeviceIntPtr devBacku
devBackup -> kbdfeed = dev -> kbdfeed; devBackup -> kbdfeed = dev -> kbdfeed;
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "nxagentSaveKeyboardDeviceData: Saved device data.\n"); fprintf(stderr, "%s: Saved device data.\n", __func__);
#endif #endif
return 1; return 1;
...@@ -1079,7 +1078,7 @@ static int nxagentRestoreKeyboardDeviceData(DeviceIntPtr devBackup, DeviceIntPtr ...@@ -1079,7 +1078,7 @@ static int nxagentRestoreKeyboardDeviceData(DeviceIntPtr devBackup, DeviceIntPtr
if (!devBackup) if (!devBackup)
{ {
#ifdef PANIC #ifdef PANIC
fprintf(stderr, "nxagentRestoreKeyboardDeviceData: PANIC! Pointer to backup structure is null.\n"); fprintf(stderr, "%s: PANIC! Pointer to backup structure is null.\n", __func__);
#endif #endif
return -1; return -1;
...@@ -1090,7 +1089,7 @@ static int nxagentRestoreKeyboardDeviceData(DeviceIntPtr devBackup, DeviceIntPtr ...@@ -1090,7 +1089,7 @@ static int nxagentRestoreKeyboardDeviceData(DeviceIntPtr devBackup, DeviceIntPtr
dev -> kbdfeed = devBackup -> kbdfeed; dev -> kbdfeed = devBackup -> kbdfeed;
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "nxagentRestoreKeyboardDeviceData: Restored device data.\n"); fprintf(stderr, "%s: Restored device data.\n", __func__);
#endif #endif
return 1; return 1;
...@@ -1102,7 +1101,7 @@ static int nxagentFreeKeyboardDeviceData(DeviceIntPtr dev) ...@@ -1102,7 +1101,7 @@ static int nxagentFreeKeyboardDeviceData(DeviceIntPtr dev)
if (!dev) if (!dev)
{ {
#ifdef PANIC #ifdef PANIC
fprintf(stderr, "nxagentFreeKeyboardDeviceData: PANIC! Pointer to device structure is null.\n"); fprintf(stderr, "%s: PANIC! Pointer to device structure is null.\n", __func__);
#endif #endif
return -1; return -1;
...@@ -1144,7 +1143,7 @@ static int nxagentFreeKeyboardDeviceData(DeviceIntPtr dev) ...@@ -1144,7 +1143,7 @@ static int nxagentFreeKeyboardDeviceData(DeviceIntPtr dev)
} }
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "nxagentFreeKeyboardDeviceData: Freed device data.\n"); fprintf(stderr, "%s: Freed device data.\n", __func__);
#endif #endif
return 1; return 1;
...@@ -1158,7 +1157,7 @@ int ProcXkbInhibited(register ClientPtr client) ...@@ -1158,7 +1157,7 @@ int ProcXkbInhibited(register ClientPtr client)
unsigned char minorop; unsigned char minorop;
#ifdef TEST #ifdef TEST
fprintf(stderr, "ProcXkbInhibited: Called.\n"); fprintf(stderr, "%s: Called.\n", __func__);
#endif #endif
majorop = ((xReq *)client->requestBuffer)->reqType; majorop = ((xReq *)client->requestBuffer)->reqType;
...@@ -1166,7 +1165,7 @@ int ProcXkbInhibited(register ClientPtr client) ...@@ -1166,7 +1165,7 @@ int ProcXkbInhibited(register ClientPtr client)
#ifdef PANIC #ifdef PANIC
if (majorop != (unsigned char)nxagentXkbWrapper.base) if (majorop != (unsigned char)nxagentXkbWrapper.base)
{ {
fprintf(stderr, "ProcXkbInhibited: MAJOROP is [%d] but should be [%d].\n", fprintf(stderr, "%s: MAJOROP is [%d] but should be [%d].\n", __func__,
majorop, nxagentXkbWrapper.base); majorop, nxagentXkbWrapper.base);
} }
#endif #endif
...@@ -1174,7 +1173,7 @@ int ProcXkbInhibited(register ClientPtr client) ...@@ -1174,7 +1173,7 @@ int ProcXkbInhibited(register ClientPtr client)
minorop = *((unsigned char *) client->requestBuffer + 1); minorop = *((unsigned char *) client->requestBuffer + 1);
#ifdef TEST #ifdef TEST
fprintf(stderr, "ProcXkbInhibited: MAJOROP is [%d] MINOROP is [%d].\n", fprintf(stderr, "%s: MAJOROP is [%d] MINOROP is [%d].\n", __func__,
majorop, minorop); majorop, minorop);
#endif #endif
...@@ -1229,13 +1228,13 @@ void nxagentInitXkbWrapper(void) ...@@ -1229,13 +1228,13 @@ void nxagentInitXkbWrapper(void)
ExtensionEntry * extension; ExtensionEntry * extension;
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentInitXkbWrapper: Called.\n"); fprintf(stderr, "%s: Called.\n", __func__);
#endif #endif
if (!nxagentOption(InhibitXkb)) if (!nxagentOption(InhibitXkb))
{ {
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentInitXkbWrapper: Nothing to do.\n"); fprintf(stderr, "%s: Nothing to do.\n", __func__);
#endif #endif
return; return;
...@@ -1252,7 +1251,7 @@ void nxagentInitXkbWrapper(void) ...@@ -1252,7 +1251,7 @@ void nxagentInitXkbWrapper(void)
nxagentXkbWrapper.SProcXkbDispatchBackup = NULL; nxagentXkbWrapper.SProcXkbDispatchBackup = NULL;
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentInitXkbWrapper: base [%d] eventBase [%d] errorBase [%d].\n", fprintf(stderr, "%s: base [%d] eventBase [%d] errorBase [%d].\n", __func__,
extension -> base, extension -> eventBase, extension -> errorBase); extension -> base, extension -> eventBase, extension -> errorBase);
#endif #endif
} }
...@@ -1261,7 +1260,7 @@ void nxagentInitXkbWrapper(void) ...@@ -1261,7 +1260,7 @@ void nxagentInitXkbWrapper(void)
nxagentXkbWrapper.base = -1; nxagentXkbWrapper.base = -1;
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentInitXkbWrapper: XKEYBOARD extension not found.\n"); fprintf(stderr, "%s: XKEYBOARD extension not found.\n", __func__);
#endif #endif
} }
} }
...@@ -1269,7 +1268,7 @@ void nxagentInitXkbWrapper(void) ...@@ -1269,7 +1268,7 @@ void nxagentInitXkbWrapper(void)
void nxagentDisableXkbExtension(void) void nxagentDisableXkbExtension(void)
{ {
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentDisableXkbExtension: Called.\n"); fprintf(stderr, "%s: Called.\n", __func__);
#endif #endif
if (nxagentXkbWrapper.base > 0) if (nxagentXkbWrapper.base > 0)
...@@ -1283,7 +1282,7 @@ void nxagentDisableXkbExtension(void) ...@@ -1283,7 +1282,7 @@ void nxagentDisableXkbExtension(void)
#ifdef TEST #ifdef TEST
else else
{ {
fprintf(stderr, "nxagentDisableXkbExtension: Nothing to be done for ProcXkbDispatch.\n"); fprintf(stderr, "%s: Nothing to be done for ProcXkbDispatch.\n", __func__);
} }
#endif #endif
...@@ -1296,7 +1295,7 @@ void nxagentDisableXkbExtension(void) ...@@ -1296,7 +1295,7 @@ void nxagentDisableXkbExtension(void)
#ifdef TEST #ifdef TEST
else else
{ {
fprintf(stderr, "nxagentDisableXkbExtension: Nothing to be done for SProcXkbDispatch.\n"); fprintf(stderr, "%s: Nothing to be done for SProcXkbDispatch.\n", __func__);
} }
#endif #endif
} }
...@@ -1305,7 +1304,7 @@ void nxagentDisableXkbExtension(void) ...@@ -1305,7 +1304,7 @@ void nxagentDisableXkbExtension(void)
void nxagentEnableXkbExtension(void) void nxagentEnableXkbExtension(void)
{ {
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentEnableXkbExtension: Called.\n"); fprintf(stderr, "%s: Called.\n", __func__);
#endif #endif
if (nxagentXkbWrapper.base > 0) if (nxagentXkbWrapper.base > 0)
...@@ -1319,7 +1318,7 @@ void nxagentEnableXkbExtension(void) ...@@ -1319,7 +1318,7 @@ void nxagentEnableXkbExtension(void)
#ifdef TEST #ifdef TEST
else else
{ {
fprintf(stderr, "nxagentEnableXkbExtension: Nothing to be done for ProcXkbDispatch.\n"); fprintf(stderr, "%s: Nothing to be done for ProcXkbDispatch.\n", __func__);
} }
#endif #endif
...@@ -1332,7 +1331,7 @@ void nxagentEnableXkbExtension(void) ...@@ -1332,7 +1331,7 @@ void nxagentEnableXkbExtension(void)
#ifdef TEST #ifdef TEST
else else
{ {
fprintf(stderr, "nxagentEnableXkbExtension: Nothing to be done for SProcXkbDispatch.\n"); fprintf(stderr, "%s: Nothing to be done for SProcXkbDispatch.\n", __func__);
} }
#endif #endif
} }
...@@ -1353,7 +1352,7 @@ void nxagentTuneXkbWrapper(void) ...@@ -1353,7 +1352,7 @@ void nxagentTuneXkbWrapper(void)
if (!nxagentOption(InhibitXkb)) if (!nxagentOption(InhibitXkb))
{ {
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentTuneXkbWrapper: Nothing to do.\n"); fprintf(stderr, "%s: Nothing to do.\n", __func__);
#endif #endif
return; return;
......
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