diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2021-11-26 09:59:21 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2021-12-20 15:01:56 +1000 |
| commit | 9c12ae753fbb06ef83e79d4438941a33b8c896da (patch) | |
| tree | adf0558e9ac8f99fa6ef83fee7ee7a2c451718a8 | |
| parent | bff714f45b48b551c0662658578c5e4080738670 (diff) | |
| download | xf86-input-wacom-9c12ae753fbb06ef83e79d4438941a33b8c896da.tar.gz | |
Prefer priv->name over pInfo->name
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/wcmConfig.c | 6 | ||||
| -rw-r--r-- | src/wcmUSB.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/wcmConfig.c b/src/wcmConfig.c index 8d04767..901c41c 100644 --- a/src/wcmConfig.c +++ b/src/wcmConfig.c @@ -739,7 +739,7 @@ int wcmPreInit(WacomDevicePtr priv) common->debugLevel = wcmOptGetInt(priv, "CommonDBG", common->debugLevel); - oldname = strdup(pInfo->name); + oldname = strdup(priv->name); if (wcmIsHotpluggedDevice(priv)) is_dependent = 1; @@ -748,8 +748,8 @@ int wcmPreInit(WacomDevicePtr priv) /* we need subdevices, change the name so all of them have a type. */ char *new_name; - if (asprintf(&new_name, "%s %s", pInfo->name, type) == -1) - new_name = strdup(pInfo->name); + if (asprintf(&new_name, "%s %s", priv->name, type) == -1) + new_name = strdup(priv->name); free(pInfo->name); free(priv->name); pInfo->name = new_name; diff --git a/src/wcmUSB.c b/src/wcmUSB.c index 3dcd0f3..17ab3e1 100644 --- a/src/wcmUSB.c +++ b/src/wcmUSB.c @@ -1936,7 +1936,7 @@ static void usbDispatchEvents(WacomDevicePtr priv) else wcmLog(NULL, W_ERROR, "%s: rel event recv'd (%d)!\n", - pInfo->name, + priv->name, event->code); } else if (event->type == EV_KEY) |