diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-07-14 13:14:16 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-07-14 13:14:16 -0700 |
| commit | 9cc5531bf1713ebdd06a88b7e05ea4bedea3d61c (patch) | |
| tree | 0217fec1ed3a2e43e07834e0b3db85d397b59e22 | |
| parent | f538ef64614d1e4cc86c96f42b298876152b1645 (diff) | |
Clears -Wcalloc-transposed-args warnings from gcc 14.1, such as:
mouse.c: In function ‘MousePreInit’:
mouse.c:900:32: warning: ‘calloc’ sizes specified with ‘sizeof’ in the
earlier argument and not in the later argument [-Wcalloc-transposed-args]
900 | if (!(pMse = calloc(sizeof(MouseDevRec), 1)))
| ^~~~~~~~~~~
mouse.c:900:32: note: earlier argument should specify number of elements,
later size of each element
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse/-/merge_requests/17>
| -rw-r--r-- | src/bsd_mouse.c | 2 | ||||
| -rw-r--r-- | src/hurd_mouse.c | 2 | ||||
| -rw-r--r-- | src/lnx_mouse.c | 2 | ||||
| -rw-r--r-- | src/mouse.c | 4 | ||||
| -rw-r--r-- | src/sun_mouse.c | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/bsd_mouse.c b/src/bsd_mouse.c index 3df7691..55b395e 100644 --- a/src/bsd_mouse.c +++ b/src/bsd_mouse.c @@ -774,7 +774,7 @@ OSMouseInit(int flags) { OSMouseInfoPtr p; - p = calloc(sizeof(OSMouseInfoRec), 1); + p = calloc(1, sizeof(OSMouseInfoRec)); if (!p) return NULL; p->SupportedInterfaces = SupportedInterfaces; diff --git a/src/hurd_mouse.c b/src/hurd_mouse.c index 3bf95a0..d290b17 100644 --- a/src/hurd_mouse.c +++ b/src/hurd_mouse.c @@ -230,7 +230,7 @@ OSMouseInit(int flags) { OSMouseInfoPtr p; - p = calloc(sizeof(OSMouseInfoRec), 1); + p = calloc(1, sizeof(OSMouseInfoRec)); if (!p) return NULL; p->SupportedInterfaces = SupportedInterfaces; diff --git a/src/lnx_mouse.c b/src/lnx_mouse.c index ae09846..c25c099 100644 --- a/src/lnx_mouse.c +++ b/src/lnx_mouse.c @@ -210,7 +210,7 @@ OSMouseInit(int flags) { OSMouseInfoPtr p; - p = calloc(sizeof(OSMouseInfoRec), 1); + p = calloc(1, sizeof(OSMouseInfoRec)); if (!p) return NULL; p->SupportedInterfaces = SupportedInterfaces; diff --git a/src/mouse.c b/src/mouse.c index 70f2157..210b144 100644 --- a/src/mouse.c +++ b/src/mouse.c @@ -897,7 +897,7 @@ MousePreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) pInfo->dev = NULL; /* Allocate the MouseDevRec and initialise it. */ - if (!(pMse = calloc(sizeof(MouseDevRec), 1))) + if (!(pMse = calloc(1, sizeof(MouseDevRec)))) { rc = BadAlloc; goto out; @@ -968,7 +968,7 @@ MousePreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) xf86CloseSerial(pInfo->fd); pInfo->fd = -1; - if (!(mPriv = (pointer) calloc(sizeof(mousePrivRec), 1))) + if (!(mPriv = (pointer) calloc(1, sizeof(mousePrivRec)))) { rc = BadAlloc; goto out; diff --git a/src/sun_mouse.c b/src/sun_mouse.c index 45c13d6..614b6d5 100644 --- a/src/sun_mouse.c +++ b/src/sun_mouse.c @@ -225,7 +225,7 @@ vuidPreInit(InputInfoPtr pInfo, const char *protocol, int flags) if (getVuidMsePriv(pInfo) != NULL) return TRUE; - pVuidMse = calloc(sizeof(VuidMseRec), 1); + pVuidMse = calloc(1, sizeof(VuidMseRec)); if (pVuidMse == NULL) { xf86Msg(X_ERROR, "%s: cannot allocate VuidMouseRec\n", pInfo->name); free(pMse); @@ -928,7 +928,7 @@ OSMouseInit(int flags) { OSMouseInfoPtr p; - p = calloc(sizeof(OSMouseInfoRec), 1); + p = calloc(1, sizeof(OSMouseInfoRec)); if (!p) return NULL; p->SupportedInterfaces = SupportedInterfaces; |