Changeset d30e067 in mainline for uspace/lib/trackmod/xm.c

Timestamp:

2025-03-02T20:02:33Z (5 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

8cdf360

Parents:

7debda3 (diff), 4285f384 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 'upstream/master' into helenraid-para

File:

• uspace/lib/trackmod/xm.c (modified) (3 diffs)

uspace/lib/trackmod/xm.c

@@ -66 +66 @@
         }
 
-        module->ord_list = calloc(sizeof(size_t), module->ord_list_len);
+        module->ord_list = calloc(module->ord_list_len, sizeof(size_t));
         if (module->ord_list == NULL) {
                 printf("Out of memory.\n");
@@ -176 +176 @@
         int ret;
 
-        module->pattern = calloc(sizeof(trackmod_pattern_t), module->patterns);
+        module->pattern = calloc(module->patterns, sizeof(trackmod_pattern_t));
         if (module->pattern == NULL) {
                 rc = ENOMEM;
@@ -208 +208 @@
                 module->pattern[i].rows = rows;
                 module->pattern[i].channels = module->channels;
-                module->pattern[i].data = calloc(sizeof(trackmod_cell_t),
-                    rows * module->channels);
+                module->pattern[i].data = calloc(rows * module->channels,
+                    sizeof(trackmod_cell_t));
 
                 if (module->pattern[i].data == NULL) {