Codebase list alsa-lib / e91b1c0
topology: straight printf and error path fixes Signed-off-by: Jaroslav Kysela <perex@perex.cz> Jaroslav Kysela 3 years ago
3 changed file(s) with 16 addition(s) and 14 deletion(s). Raw diff Collapse all Expand all
+2
-2
src/topology/ctl.c less more
878878 if (err >= 0 && mc->max > 0)
879879 err = tplg_save_printf(dst, pfx, "\tmax %u\n", mc->max);
880880 if (err >= 0 && mc->invert > 0)
881 err = tplg_save_printf(dst, pfx, "\tinvert 1\n", mc->max);
881 err = tplg_save_printf(dst, pfx, "\tinvert 1\n");
882882 if (err >= 0 && mc->invert > 0)
883 err = tplg_save_printf(dst, pfx, "\tinvert 1\n", mc->max);
883 err = tplg_save_printf(dst, pfx, "\tinvert 1\n");
884884 if (err >= 0)
885885 err = tplg_save_ops(tplg, &mc->hdr, dst, pfx2);
886886 if (err >= 0)
+1
-1
src/topology/dapm.c less more
482482 }
483483 if (first) {
484484 first = 0;
485 err = tplg_save_printf(dst, pfx, "\t\tlines [\n", elem->index);
485 err = tplg_save_printf(dst, pfx, "\t\tlines [\n");
486486 if (err < 0)
487487 return err;
488488 }
+13
-11
src/topology/data.c less more
929929 err = tplg_save_printf(dst, pfx, "\t'%s' ",
930930 tuple->token);
931931 }
932 if (err < 0)
933 return err;
932934 switch (set->type) {
933935 case SND_SOC_TPLG_TUPLE_TYPE_UUID:
934936 err = tplg_save_printf(dst, NULL, "'" UUID_FORMAT "'\n",
12751277 elem->id, index, ref->id);
12761278 } else {
12771279 err = tplg_save_printf(dst, pfx, "\t'%s'\n", ref->id);
1278 if (err < 0)
1279 return err;
1280 }
1280 }
1281 if (err < 0)
1282 return err;
12811283 index++;
12821284 }
12831285 if (count > 1) {
16111613 if (!elem)
16121614 return -ENOMEM;
16131615
1614 tplg_log(tplg, 'D', pos, "manifest: private size %d", size);
1616 tplg_log(tplg, 'D', pos, "manifest: private size %zd", size);
16151617 return tplg_add_data(tplg, elem, bin, size);
16161618 }
16171619
16711673
16721674 va = bin;
16731675 if (size < sizeof(*va) || size < va->size) {
1674 tplg_log(tplg, 'A', pos, "tuple set verify: wrong size %d", size);
1676 tplg_log(tplg, 'A', pos, "tuple set verify: wrong size %zd", size);
16751677 return -EINVAL;
16761678 }
16771679
17181720
17191721 va = bin;
17201722 if (size < sizeof(*va) || size < va->size) {
1721 SNDERR("tuples: wrong size %d", size);
1723 SNDERR("tuples: wrong size %zd", size);
17221724 return -EINVAL;
17231725 }
17241726
18051807 int err;
18061808
18071809 if (size < sizeof(*va)) {
1808 tplg_log(tplg, 'A', pos, "tuples: small size %d", size);
1810 tplg_log(tplg, 'A', pos, "tuples: small size %zd", size);
18091811 return -EINVAL;
18101812 }
18111813
18121814 next:
18131815 va = bin;
18141816 if (size < sizeof(*va)) {
1815 tplg_log(tplg, 'A', pos, "tuples: unexpected vendor arry size %d", size);
1817 tplg_log(tplg, 'A', pos, "tuples: unexpected vendor arry size %zd", size);
18161818 return -EINVAL;
18171819 }
18181820
18411843 int err;
18421844
18431845 if (size < sizeof(*va)) {
1844 SNDERR("tuples: small size %d", size);
1846 SNDERR("tuples: small size %zd", size);
18451847 return -EINVAL;
18461848 }
18471849
18481850 next:
18491851 va = bin;
18501852 if (size < sizeof(*va)) {
1851 SNDERR("tuples: unexpected vendor arry size %d", size);
1853 SNDERR("tuples: unexpected vendor arry size %zd", size);
18521854 return -EINVAL;
18531855 }
18541856
18931895 next:
18941896 tp = bin;
18951897 if (off + size < tp->size) {
1896 SNDERR("data: unexpected element size %d", size);
1898 SNDERR("data: unexpected element size %zd", size);
18971899 return -EINVAL;
18981900 }
18991901