diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-01-31 12:07:48 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-01-31 12:07:48 +1000 |
| commit | 54ac2306b83434a014e941e25a5286a592e74351 (patch) | |
| tree | 0f12f0f2993fcf16bcd54bf5b3d844cd9eaaa5bd /src/draglock.c | |
| parent | Add support for masked valuators (diff) | |
| download | xf86-input-evdev-54ac2306b83434a014e941e25a5286a592e74351.tar.gz xf86-input-evdev-54ac2306b83434a014e941e25a5286a592e74351.tar.bz2 xf86-input-evdev-54ac2306b83434a014e941e25a5286a592e74351.zip | |
Replace xf86Msg() with xf86IDrvMsg().
The latter provides a standardised message format in the form of
driver name: device name: message
making it easier to grep for driver messages in the log.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/draglock.c')
| -rw-r--r-- | src/draglock.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/draglock.c b/src/draglock.c index 0b430f0..ac9d9c0 100644 --- a/src/draglock.c +++ b/src/draglock.c @@ -103,13 +103,12 @@ EvdevDragLockPreInit(InputInfoPtr pInfo) /* We only have a meta button */ pEvdev->dragLock.meta = meta_button; - xf86Msg(X_CONFIG, "%s: DragLockButtons : " - "%i as meta\n", - pInfo->name, meta_button); + xf86IDrvMsg(pInfo, X_CONFIG, "DragLockButtons : " + "%i as meta\n", meta_button); } else { - xf86Msg(X_ERROR, "%s: DragLockButtons : " - "Incomplete pair specifying button pairs %s\n", - pInfo->name, option_string); + xf86IDrvMsg(pInfo, X_ERROR, "DragLockButtons : " + "Incomplete pair specifying button pairs %s\n", + option_string); } } else { @@ -117,23 +116,24 @@ EvdevDragLockPreInit(InputInfoPtr pInfo) if ((meta_button <= EVDEV_MAXBUTTONS) && (meta_button >= 0 ) && (lock_button <= EVDEV_MAXBUTTONS) && (lock_button >= 0)) { - xf86Msg(X_CONFIG, "%s: DragLockButtons : %i -> %i\n", - pInfo->name, meta_button, lock_button); + xf86IDrvMsg(pInfo, X_CONFIG, + "DragLockButtons : %i -> %i\n", + meta_button, lock_button); pEvdev->dragLock.lock_pair[meta_button - 1] = lock_button; pairs=TRUE; } else { /* Let the user know something was wrong with this pair of buttons */ - xf86Msg(X_CONFIG, "%s: DragLockButtons : " - "Invalid button pair %i -> %i\n", - pInfo->name, meta_button, lock_button); + xf86IDrvMsg(pInfo, X_CONFIG,"DragLockButtons : " + "Invalid button pair %i -> %i\n", + meta_button, lock_button); } } } else { - xf86Msg(X_ERROR, "%s: Found DragLockButtons " - "with invalid lock button string : '%s'\n", - pInfo->name, option_string); + xf86IDrvMsg(pInfo, X_ERROR, "Found DragLockButtons " + "with invalid lock button string : '%s'\n", + option_string); /* This should be the case anyhow, just make sure */ next_num = NULL; |