SecBSD/xenocara
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync code with last improvements from OpenBSD

Browse source
This commit is contained in:
purplerain 2023-09-07 19:01:26 +00:00
parent 5d9ce0a053
commit 7ca5d43115
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
2 changed files with 20 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

46
driver/xf86-input-usbtablet/src/usbtablet.c
View file

@ -24,7 +24,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
/* $OpenBSD: usbtablet.c,v 1.14 2012/09/08 13:16:09 matthieu Exp $ */ /* $OpenBSD: usbtablet.c,v 1.15 2023/09/07 09:13:51 robert Exp $ */
/* /*
* Driver for USB HID tablet devices. * Driver for USB HID tablet devices.
@ -56,18 +56,6 @@
#include <usbhid.h> #include <usbhid.h>
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) > 10
#undef xalloc
#undef xcalloc
#define xcalloc calloc
#define xalloc malloc
#define Xcalloc calloc
#define Xalloc malloc
#define Xfree free
#define Xrealloc realloc
#endif
#define SYSCALL(call) while(((call) == -1) && (errno == EINTR)) #define SYSCALL(call) while(((call) == -1) && (errno == EINTR))
#define ABS(x) ((x) > 0 ? (x) : -(x)) #define ABS(x) ((x) > 0 ? (x) : -(x))
#define mils(res) (res * 1000 / 2.54) /* resolution */ #define mils(res) (res * 1000 / 2.54) /* resolution */
@ -86,7 +74,7 @@
typedef struct USBTDevice USBTDevice, *USBTDevicePtr; typedef struct USBTDevice USBTDevice, *USBTDevicePtr;
typedef struct { typedef struct {
char *devName; const char *devName;
int nDevs; int nDevs;
InputInfoPtr *devices; InputInfoPtr *devices;
double factorX; double factorX;
@ -337,7 +325,7 @@ UsbTabletReadInput(InputInfoPtr pInfo)
if (len <= 0) { if (len <= 0) {
if (errno != EAGAIN) { if (errno != EAGAIN) {
Error("error reading USBT device"); ErrorF("error reading USBT device\n");
} }
break; break;
} }
@ -553,7 +541,7 @@ UsbTabletOpen(InputInfoPtr pInfo)
rd = hid_get_report_desc(pInfo->fd); rd = hid_get_report_desc(pInfo->fd);
if (rd == 0) { if (rd == 0) {
Error(comm->devName); ErrorF("%s\n", comm->devName);
SYSCALL(close(pInfo->fd)); SYSCALL(close(pInfo->fd));
return !Success; return !Success;
} }
@ -760,14 +748,14 @@ UsbTabletAllocate(InputDriverPtr drv, InputInfoPtr pInfo, char *name, int flag)
return BadValue; return BadValue;
} }
priv = (USBTDevicePtr)xalloc(sizeof(USBTDevice)); priv = (USBTDevicePtr)malloc(sizeof(USBTDevice));
if (priv == NULL) { if (priv == NULL) {
return BadAlloc; return BadAlloc;
} }
comm = (USBTCommonPtr)xalloc(sizeof(USBTCommon)); comm = (USBTCommonPtr)malloc(sizeof(USBTCommon));
if (comm == NULL) { if (comm == NULL) {
xfree(priv); free(priv);
return BadAlloc; return BadAlloc;
} }
memset(priv, 0, sizeof *priv); memset(priv, 0, sizeof *priv);
@ -795,10 +783,10 @@ UsbTabletAllocate(InputDriverPtr drv, InputInfoPtr pInfo, char *name, int flag)
priv->thresCent = 5; priv->thresCent = 5;
comm->nDevs = 1; comm->nDevs = 1;
comm->devices = (InputInfoPtr*)xalloc(sizeof(InputInfoPtr)); comm->devices = (InputInfoPtr*)malloc(sizeof(InputInfoPtr));
if (comm->devices == NULL) { if (comm->devices == NULL) {
xfree(comm); free(comm);
xfree(priv); free(priv);
return BadAlloc; return BadAlloc;
} }
comm->devices[0] = pInfo; comm->devices[0] = pInfo;
@ -827,7 +815,7 @@ UsbTabletPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
USBTCommonPtr comm = NULL, c; USBTCommonPtr comm = NULL, c;
USBTDevicePtr priv = NULL, p; USBTDevicePtr priv = NULL, p;
InputInfoPtr localDevices; InputInfoPtr localDevices;
char *s; const char *s;
int i, rc = Success; int i, rc = Success;
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
@ -881,12 +869,12 @@ UsbTabletPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
DBG(2, ErrorF("UsbTabletPreInit port share between" DBG(2, ErrorF("UsbTabletPreInit port share between"
" %s and %s\n", " %s and %s\n",
pInfo->name, localDevices->name)); pInfo->name, localDevices->name));
xfree(comm->devices); free(comm->devices);
xfree(comm); free(comm);
comm = priv->comm = c; comm = priv->comm = c;
comm->nDevs++; comm->nDevs++;
comm->devices = (InputInfoPtr *) comm->devices = (InputInfoPtr *)
xrealloc(comm->devices, realloc(comm->devices,
sizeof(InputInfoPtr)* comm->nDevs); sizeof(InputInfoPtr)* comm->nDevs);
comm->devices[comm->nDevs - 1] = pInfo; comm->devices[comm->nDevs - 1] = pInfo;
break; break;
@ -941,13 +929,13 @@ UsbTabletPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
PreInit_fail: PreInit_fail:
if (comm) { if (comm) {
xfree(comm); free(comm);
} }
if (priv) { if (priv) {
xfree(priv); free(priv);
} }
if (pInfo) { if (pInfo) {
xfree(pInfo); free(pInfo);
} }
return rc; return rc;
} }

6
lib/libxcvt/Makefile
View file

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2022/08/07 07:29:26 matthieu Exp $ # $OpenBSD: Makefile,v 1.4 2023/09/06 20:36:50 matthieu Exp $
SUBDIR= lib cvt SUBDIR= lib cvt
@ -6,7 +6,7 @@ INCS= libxcvt.h libxcvt_mode.h
PACKAGE_VERSION= 0.1.2 PACKAGE_VERSION= 0.1.2
PKGCONFIG= libxcvt.pc PKGCONFIG= libxcvt.pc
EXTRA_PKGCONFIG_SUBST= -e 's/@VERSION@/${PACKAGE_VERSION}/'
obj: _xenocara_obj obj: _xenocara_obj
@ -18,7 +18,7 @@ includes: _SUBDIRUSE
eval "$$j"; \ eval "$$j"; \
done done
beforeinstall: includes beforeinstall: includes
.include <bsd.subdir.mk> .include <bsd.subdir.mk>
.include <bsd.xorg.mk> .include <bsd.xorg.mk>