XLibre/xf86-video-intel
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-intel.git synced 2026-04-14 10:54:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix transposed calloc() arguments

Browse Source 
gcc-14 complains:
../src/legacy/i810/i810_dri.c:281:48: warning: ‘calloc’ sizes specified with ‘sizeof’ in the earlier argument and not in the later argument [-Wcalloc-transposed-args]
...

Fix them all up via cocci:
@@
expression E1, E2;
type T;
@@
(
- calloc(sizeof(T), E2)
+ calloc(E2, sizeof(T))
|
- calloc(sizeof(E1), E2)
+ calloc(E2, sizeof(E1))
)

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
This commit is contained in:
Ville Syrjälä
2025-02-10 19:13:21 +02:00
parent e6a4c4740c
commit fc07603ee0
18 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/legacy/i810/i810_dri.c
View File

@@ -278,7 +278,7 @@ I810DRIScreenInit(ScreenPtr pScreen)
}
pDRIInfo->SAREASize = SAREA_MAX;
if (!(pI810DRI = (I810DRIPtr) calloc(sizeof(I810DRIRec), 1))) {
if (!(pI810DRI = (I810DRIPtr) calloc(1, sizeof(I810DRIRec)))) {
DRIDestroyInfoRec(pI810->pDRIInfo);
pI810->pDRIInfo = NULL;
return FALSE;

2
src/legacy/i810/i810_driver.c
View File

@@ -1544,7 +1544,7 @@ I810ScreenInit(SCREEN_INIT_ARGS_DECL)
pI810 = I810PTR(scrn);
hwp = VGAHWPTR(scrn);
pI810->LpRing = calloc(sizeof(I810RingBuffer),1);
pI810->LpRing = calloc(1, sizeof(I810RingBuffer));
if (!pI810->LpRing) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Could not allocate lpring data structure.\n");

4
src/sna/sna_display.c
View File

@@ -3793,7 +3793,7 @@ sna_crtc_add(ScrnInfoPtr scrn, unsigned id, int index)
DBG(("%s(%d): is-zaphod? %d\n", __FUNCTION__, id, is_zaphod(scrn)));
sna_crtc = calloc(sizeof(struct sna_crtc), 1);
sna_crtc = calloc(1, sizeof(struct sna_crtc));
if (sna_crtc == NULL)
return false;
@@ -5321,7 +5321,7 @@ sna_output_add(struct sna *sna, unsigned id, unsigned serial)
possible_crtcs >>= ffs(zaphod_crtcs) - 1;
}
sna_output = calloc(sizeof(struct sna_output), 1);
sna_output = calloc(1, sizeof(struct sna_output));
if (!sna_output)
return -1;

4
src/sna/sna_glyphs.c
View File

@@ -269,8 +269,8 @@ bool sna_glyphs_create(struct sna *sna)
cache->count = cache->evict = 0;
cache->picture = picture;
cache->glyphs = calloc(sizeof(struct sna_glyph *),
GLYPH_CACHE_SIZE);
cache->glyphs = calloc(GLYPH_CACHE_SIZE,
sizeof(struct sna_glyph *));
if (!cache->glyphs)
goto bail;

8
src/uxa/intel_display.c
View File

@@ -313,7 +313,7 @@ intel_crtc_apply(xf86CrtcPtr crtc)
int fb_id, x, y;
int i, ret = FALSE;
output_ids = calloc(sizeof(uint32_t), xf86_config->num_output);
output_ids = calloc(xf86_config->num_output, sizeof(uint32_t));
if (!output_ids)
return FALSE;
@@ -734,7 +734,7 @@ intel_crtc_init(ScrnInfoPtr scrn, struct intel_mode *mode, drmModeResPtr mode_re
xf86CrtcPtr crtc;
struct intel_crtc *intel_crtc;
intel_crtc = calloc(sizeof(struct intel_crtc), 1);
intel_crtc = calloc(1, sizeof(struct intel_crtc));
if (intel_crtc == NULL)
return;
@@ -1542,7 +1542,7 @@ intel_output_init(ScrnInfoPtr scrn, struct intel_mode *mode, drmModeResPtr mode_
return;
}
}
kencoders = calloc(sizeof(drmModeEncoderPtr), koutput->count_encoders);
kencoders = calloc(koutput->count_encoders, sizeof(drmModeEncoderPtr));
if (!kencoders) {
goto out_free_encoders;
}
@@ -1558,7 +1558,7 @@ intel_output_init(ScrnInfoPtr scrn, struct intel_mode *mode, drmModeResPtr mode_
goto out_free_encoders;
}
intel_output = calloc(sizeof(struct intel_output), 1);
intel_output = calloc(1, sizeof(struct intel_output));
if (!intel_output) {
xf86OutputDestroy(output);
goto out_free_encoders;

2
src/uxa/intel_present.c
View File

@@ -168,7 +168,7 @@ intel_present_queue_vblank(RRCrtcPtr crtc,
int ret;
uint32_t seq;
event = calloc(sizeof(struct intel_present_vblank_event), 1);
event = calloc(1, sizeof(struct intel_present_vblank_event));
if (!event)
return BadAlloc;
event->event_id = event_id;

2
src/uxa/uxa-glyphs.c
View File

@@ -190,7 +190,7 @@ static Bool uxa_realize_glyph_caches(ScreenPtr pScreen)
ValidatePicture(picture);
cache->picture = picture;
cache->glyphs = calloc(sizeof(GlyphPtr), GLYPH_CACHE_SIZE);
cache->glyphs = calloc(GLYPH_CACHE_SIZE, sizeof(GlyphPtr));
if (!cache->glyphs)
goto bail;

2
src/uxa/uxa.c
View File

@@ -470,7 +470,7 @@ Bool uxa_driver_init(ScreenPtr screen, uxa_driver_t * uxa_driver)
if (!dixRegisterPrivateKey(&uxa_screen_index, PRIVATE_SCREEN, 0))
return FALSE;
#endif
uxa_screen = calloc(sizeof(uxa_screen_t), 1);
uxa_screen = calloc(1, sizeof(uxa_screen_t));
if (!uxa_screen) {
LogMessage(X_WARNING,

3
test/basic-copyarea.c
View File

@@ -154,7 +154,8 @@ static void area_tests(struct test *t, int reps, int sets, enum target target)
{
struct test_target tt;
XImage image;
uint32_t *cells = calloc(sizeof(uint32_t), t->out.width*t->out.height);
uint32_t *cells = calloc(t->out.width * t->out.height,
sizeof(uint32_t));
int r, s, x, y;
printf("Testing area sets (%s): ", test_target_name(target));

3
test/basic-fillrect.c
View File

@@ -124,7 +124,8 @@ static void area_tests(struct test *t, int reps, int sets, enum target target)
{
struct test_target tt;
XImage image;
uint32_t *cells = calloc(sizeof(uint32_t), t->out.width*t->out.height);
uint32_t *cells = calloc(t->out.width * t->out.height,
sizeof(uint32_t));
int r, s, x, y;
printf("Testing area sets (%s): ", test_target_name(target));

3
test/basic-putimage.c
View File

@@ -144,7 +144,8 @@ static void area_tests(struct test *t, int reps, int sets, enum target target, i
{
struct test_target tt;
XImage image;
uint32_t *cells = calloc(sizeof(uint32_t), t->out.width*t->out.height);
uint32_t *cells = calloc(t->out.width * t->out.height,
sizeof(uint32_t));
int r, s, x, y;
printf("Testing area sets (%s %s shm): ",

3
test/render-composite-solid.c
View File

@@ -109,7 +109,8 @@ static void area_tests(struct test *t, int reps, int sets, enum target target)
{
struct test_target tt;
XImage image;
uint32_t *cells = calloc(sizeof(uint32_t), t->out.width*t->out.height);
uint32_t *cells = calloc(t->out.width * t->out.height,
sizeof(uint32_t));
int r, s, x, y;
printf("Testing area sets (%s): ", test_target_name(target));

3
test/render-copy-alphaless.c
View File

@@ -139,7 +139,8 @@ static void area_tests(struct test *t, int reps, int sets, enum target target)
{
struct test_target tt;
XImage image;
uint32_t *cells = calloc(sizeof(uint32_t), t->out.width*t->out.height);
uint32_t *cells = calloc(t->out.width * t->out.height,
sizeof(uint32_t));
int r, s, x, y;
printf("Testing area sets (%s): ", test_target_name(target));

3
test/render-copyarea.c
View File

@@ -158,7 +158,8 @@ static void area_tests(struct test *t, int reps, int sets, enum target target)
{
struct test_target tt;
XImage image;
uint32_t *cells = calloc(sizeof(uint32_t), t->out.width*t->out.height);
uint32_t *cells = calloc(t->out.width * t->out.height,
sizeof(uint32_t));
int r, s, x, y;
printf("Testing area sets (%s): ", test_target_name(target));

3
test/render-fill-copy.c
View File

@@ -131,7 +131,8 @@ static void area_tests(struct test *t, int reps, int sets, enum target target)
{
struct test_target tt;
XImage image;
uint32_t *cells = calloc(sizeof(uint32_t), t->out.width*t->out.height);
uint32_t *cells = calloc(t->out.width * t->out.height,
sizeof(uint32_t));
int r, s, x, y;
printf("Testing area sets (%s): ", test_target_name(target));

3
test/render-fill.c
View File

@@ -101,7 +101,8 @@ static void area_tests(struct test *t, int reps, int sets, enum target target)
{
struct test_target tt;
XImage image;
uint32_t *cells = calloc(sizeof(uint32_t), t->out.width*t->out.height);
uint32_t *cells = calloc(t->out.width * t->out.height,
sizeof(uint32_t));
int r, s, x, y;
printf("Testing area sets (%s): ", test_target_name(target));

3
test/render-trapezoid-image.c
View File

@@ -265,7 +265,8 @@ static void area_tests(struct test *t, int reps, int sets, enum target target, i
{
struct test_target tt;
XImage image;
uint32_t *cells = calloc(sizeof(uint32_t), t->out.width*t->out.height);
uint32_t *cells = calloc(t->out.width * t->out.height,
sizeof(uint32_t));
int r, s, x, y;
printf("Testing area sets (%s using %s source): ",

3
test/render-trapezoid.c
View File

@@ -151,7 +151,8 @@ static void area_tests(struct test *t, int reps, int sets, enum target target)
{
struct test_target tt;
XImage image;
uint32_t *cells = calloc(sizeof(uint32_t), t->out.width*t->out.height);
uint32_t *cells = calloc(t->out.width * t->out.height,
sizeof(uint32_t));
int r, s, x, y;
printf("Testing area sets (%s): ", test_target_name(target));