From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Andr=C3=A9=20Goddard=20Rosa?= Subject: [PATCH v4 06/12] vsprintf: move local vars to block local vars and remove unneeded ones Date: Sat, 7 Nov 2009 13:16:14 -0200 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pw0-f53.google.com (mail-pw0-f53.google.com [209.85.160.53]) by alsa0.perex.cz (Postfix) with ESMTP id BADE7244CA for ; Sun, 8 Nov 2009 16:20:52 +0100 (CET) Received: by pwj11 with SMTP id 11so1900337pwj.32 for ; Sun, 08 Nov 2009 07:20:50 -0800 (PST) In-Reply-To: In-Reply-To: References: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@alsa-project.org Errors-To: alsa-devel-bounces@alsa-project.org To: Martin Schwidefsky , Heiko Carstens , linux390@de.ibm.com, Michael Holzheu , Andrew Morton Cc: =?UTF-8?q?Andr=C3=A9=20Goddard=20Rosa?= List-Id: alsa-devel@alsa-project.org Q2xlYW51cCBieSBtb3ZpbmcgdmFyaWFibGVzIGNsb3NlciB0byB0aGUgc2NvcGUgd2hlcmUgdGhl eSdyZSB1c2VkIGluIGZhY3QuCkFsc28sIHJlbW92ZSB1bm5lZWRlZCBvbmVzLgoKU2lnbmVkLW9m Zi1ieTogQW5kcsOpIEdvZGRhcmQgUm9zYSA8YW5kcmUuZ29kZGFyZEBnbWFpbC5jb20+CkFja2Vk LWJ5OiBGcmVkZXJpYyBXZWlzYmVja2VyIDxmd2Vpc2JlY0BnbWFpbC5jb20+Ci0tLQogbGliL3Zz cHJpbnRmLmMgfCAgIDY0ICsrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0KIDEgZmlsZXMgY2hhbmdlZCwgMjggaW5zZXJ0aW9ucygrKSwgMzYgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliL3ZzcHJpbnRmLmMgYi9saWIvdnNwcmludGYuYwpp bmRleCBhZjc5MTUyLi5mNzAzZmRmIDEwMDY0NAotLS0gYS9saWIvdnNwcmludGYuYworKysgYi9s aWIvdnNwcmludGYuYwpAQCAtODQyLDggKzg0Miw4IEBAIHN0YXRpYyBjaGFyICpwb2ludGVyKGNv bnN0IGNoYXIgKmZtdCwgY2hhciAqYnVmLCBjaGFyICplbmQsIHZvaWQgKnB0ciwKIAljYXNlICdG JzoKIAljYXNlICdmJzoKIAkJcHRyID0gZGVyZWZlcmVuY2VfZnVuY3Rpb25fZGVzY3JpcHRvcihw dHIpOwotCWNhc2UgJ3MnOgogCQkvKiBGYWxsdGhyb3VnaCAqLworCWNhc2UgJ3MnOgogCWNhc2Ug J1MnOgogCQlyZXR1cm4gc3ltYm9sX3N0cmluZyhidWYsIGVuZCwgcHRyLCBzcGVjLCAqZm10KTsK IAljYXNlICdSJzoKQEAgLTExMDUsOCArMTEwNSw3IEBAIHF1YWxpZmllcjoKIGludCB2c25wcmlu dGYoY2hhciAqYnVmLCBzaXplX3Qgc2l6ZSwgY29uc3QgY2hhciAqZm10LCB2YV9saXN0IGFyZ3Mp CiB7CiAJdW5zaWduZWQgbG9uZyBsb25nIG51bTsKLQljaGFyICpzdHIsICplbmQsIGM7Ci0JaW50 IHJlYWQ7CisJY2hhciAqc3RyLCAqZW5kOwogCXN0cnVjdCBwcmludGZfc3BlYyBzcGVjID0gezB9 OwogCiAJLyogUmVqZWN0IG91dC1vZi1yYW5nZSB2YWx1ZXMgZWFybHkuICBMYXJnZSBwb3NpdGl2 ZSBzaXplcyBhcmUKQEAgLTExMjUsOCArMTEyNCw3IEBAIGludCB2c25wcmludGYoY2hhciAqYnVm LCBzaXplX3Qgc2l6ZSwgY29uc3QgY2hhciAqZm10LCB2YV9saXN0IGFyZ3MpCiAKIAl3aGlsZSAo KmZtdCkgewogCQljb25zdCBjaGFyICpvbGRfZm10ID0gZm10OwotCi0JCXJlYWQgPSBmb3JtYXRf ZGVjb2RlKGZtdCwgJnNwZWMpOworCQlpbnQgcmVhZCA9IGZvcm1hdF9kZWNvZGUoZm10LCAmc3Bl Yyk7CiAKIAkJZm10ICs9IHJlYWQ7CiAKQEAgLTExNTAsNyArMTE0OCw5IEBAIGludCB2c25wcmlu dGYoY2hhciAqYnVmLCBzaXplX3Qgc2l6ZSwgY29uc3QgY2hhciAqZm10LCB2YV9saXN0IGFyZ3Mp CiAJCQlzcGVjLnByZWNpc2lvbiA9IHZhX2FyZyhhcmdzLCBpbnQpOwogCQkJYnJlYWs7CiAKLQkJ Y2FzZSBGT1JNQVRfVFlQRV9DSEFSOgorCQljYXNlIEZPUk1BVF9UWVBFX0NIQVI6IHsKKwkJCWNo YXIgYzsKKwogCQkJaWYgKCEoc3BlYy5mbGFncyAmIExFRlQpKSB7CiAJCQkJd2hpbGUgKC0tc3Bl Yy5maWVsZF93aWR0aCA+IDApIHsKIAkJCQkJaWYgKHN0ciA8IGVuZCkKQEAgLTExNjksNiArMTE2 OSw3IEBAIGludCB2c25wcmludGYoY2hhciAqYnVmLCBzaXplX3Qgc2l6ZSwgY29uc3QgY2hhciAq Zm10LCB2YV9saXN0IGFyZ3MpCiAJCQkJKytzdHI7CiAJCQl9CiAJCQlicmVhazsKKwkJfQogCiAJ CWNhc2UgRk9STUFUX1RZUEVfU1RSOgogCQkJc3RyID0gc3RyaW5nKHN0ciwgZW5kLCB2YV9hcmco YXJncywgY2hhciAqKSwgc3BlYyk7CkBAIC0xNDEzLDcgKzE0MTQsNiBAQCBpbnQgdmJpbl9wcmlu dGYodTMyICpiaW5fYnVmLCBzaXplX3Qgc2l6ZSwgY29uc3QgY2hhciAqZm10LCB2YV9saXN0IGFy Z3MpCiB7CiAJc3RydWN0IHByaW50Zl9zcGVjIHNwZWMgPSB7MH07CiAJY2hhciAqc3RyLCAqZW5k OwotCWludCByZWFkOwogCiAJc3RyID0gKGNoYXIgKiliaW5fYnVmOwogCWVuZCA9IChjaGFyICop KGJpbl9idWYgKyBzaXplKTsKQEAgLTE0MzksMTIgKzE0MzksMTQgQEAgZG8gewkJCQkJCQkJCVwK IH0gd2hpbGUgKDApCiAKIAl3aGlsZSAoKmZtdCkgewotCQlyZWFkID0gZm9ybWF0X2RlY29kZShm bXQsICZzcGVjKTsKKwkJaW50IHJlYWQgPSBmb3JtYXRfZGVjb2RlKGZtdCwgJnNwZWMpOwogCiAJ CWZtdCArPSByZWFkOwogCiAJCXN3aXRjaCAoc3BlYy50eXBlKSB7CiAJCWNhc2UgRk9STUFUX1RZ UEVfTk9ORToKKwkJY2FzZSBGT1JNQVRfVFlQRV9JTlZBTElEOgorCQljYXNlIEZPUk1BVF9UWVBF X1BFUkNFTlRfQ0hBUjoKIAkJCWJyZWFrOwogCiAJCWNhc2UgRk9STUFUX1RZUEVfV0lEVEg6CkBA IC0xNDc4LDEyICsxNDgwLDYgQEAgZG8gewkJCQkJCQkJCVwKIAkJCQlmbXQrKzsKIAkJCWJyZWFr OwogCi0JCWNhc2UgRk9STUFUX1RZUEVfUEVSQ0VOVF9DSEFSOgotCQkJYnJlYWs7Ci0KLQkJY2Fz ZSBGT1JNQVRfVFlQRV9JTlZBTElEOgotCQkJYnJlYWs7Ci0KIAkJY2FzZSBGT1JNQVRfVFlQRV9O UkNIQVJTOiB7CiAJCQkvKiBza2lwICVuICdzIGFyZ3VtZW50ICovCiAJCQlpbnQgcXVhbGlmaWVy ID0gc3BlYy5xdWFsaWZpZXI7CkBAIC0xNTU2LDEwICsxNTUyLDkgQEAgRVhQT1JUX1NZTUJPTF9H UEwodmJpbl9wcmludGYpOwogICovCiBpbnQgYnN0cl9wcmludGYoY2hhciAqYnVmLCBzaXplX3Qg c2l6ZSwgY29uc3QgY2hhciAqZm10LCBjb25zdCB1MzIgKmJpbl9idWYpCiB7Ci0JdW5zaWduZWQg bG9uZyBsb25nIG51bTsKLQljaGFyICpzdHIsICplbmQsIGM7Ci0JY29uc3QgY2hhciAqYXJncyA9 IChjb25zdCBjaGFyICopYmluX2J1ZjsKIAlzdHJ1Y3QgcHJpbnRmX3NwZWMgc3BlYyA9IHswfTsK KwljaGFyICpzdHIsICplbmQ7CisJY29uc3QgY2hhciAqYXJncyA9IChjb25zdCBjaGFyICopYmlu X2J1ZjsKIAogCWlmIChXQVJOX09OX09OQ0UoKGludCkgc2l6ZSA8IDApKQogCQlyZXR1cm4gMDsK QEAgLTE1ODksMTAgKzE1ODQsOCBAQCBpbnQgYnN0cl9wcmludGYoY2hhciAqYnVmLCBzaXplX3Qg c2l6ZSwgY29uc3QgY2hhciAqZm10LCBjb25zdCB1MzIgKmJpbl9idWYpCiAJfQogCiAJd2hpbGUg KCpmbXQpIHsKLQkJaW50IHJlYWQ7CiAJCWNvbnN0IGNoYXIgKm9sZF9mbXQgPSBmbXQ7Ci0KLQkJ cmVhZCA9IGZvcm1hdF9kZWNvZGUoZm10LCAmc3BlYyk7CisJCWludCByZWFkID0gZm9ybWF0X2Rl Y29kZShmbXQsICZzcGVjKTsKIAogCQlmbXQgKz0gcmVhZDsKIApAQCAtMTYxNiw3ICsxNjA5LDkg QEAgaW50IGJzdHJfcHJpbnRmKGNoYXIgKmJ1Ziwgc2l6ZV90IHNpemUsIGNvbnN0IGNoYXIgKmZt dCwgY29uc3QgdTMyICpiaW5fYnVmKQogCQkJc3BlYy5wcmVjaXNpb24gPSBnZXRfYXJnKGludCk7 CiAJCQlicmVhazsKIAotCQljYXNlIEZPUk1BVF9UWVBFX0NIQVI6CisJCWNhc2UgRk9STUFUX1RZ UEVfQ0hBUjogeworCQkJY2hhciBjOworCiAJCQlpZiAoIShzcGVjLmZsYWdzICYgTEVGVCkpIHsK IAkJCQl3aGlsZSAoLS1zcGVjLmZpZWxkX3dpZHRoID4gMCkgewogCQkJCQlpZiAoc3RyIDwgZW5k KQpAQCAtMTYzNCwxMSArMTYyOSwxMSBAQCBpbnQgYnN0cl9wcmludGYoY2hhciAqYnVmLCBzaXpl X3Qgc2l6ZSwgY29uc3QgY2hhciAqZm10LCBjb25zdCB1MzIgKmJpbl9idWYpCiAJCQkJKytzdHI7 CiAJCQl9CiAJCQlicmVhazsKKwkJfQogCiAJCWNhc2UgRk9STUFUX1RZUEVfU1RSOiB7CiAJCQlj b25zdCBjaGFyICpzdHJfYXJnID0gYXJnczsKLQkJCXNpemVfdCBsZW4gPSBzdHJsZW4oc3RyX2Fy Zyk7Ci0JCQlhcmdzICs9IGxlbiArIDE7CisJCQlhcmdzICs9IHN0cmxlbihzdHJfYXJnKSArIDE7 CiAJCQlzdHIgPSBzdHJpbmcoc3RyLCBlbmQsIChjaGFyICopc3RyX2FyZywgc3BlYyk7CiAJCQli cmVhazsKIAkJfQpAQCAtMTY1MCwxMSArMTY0NSw2IEBAIGludCBic3RyX3ByaW50ZihjaGFyICpi dWYsIHNpemVfdCBzaXplLCBjb25zdCBjaGFyICpmbXQsIGNvbnN0IHUzMiAqYmluX2J1ZikKIAkJ CWJyZWFrOwogCiAJCWNhc2UgRk9STUFUX1RZUEVfUEVSQ0VOVF9DSEFSOgotCQkJaWYgKHN0ciA8 IGVuZCkKLQkJCQkqc3RyID0gJyUnOwotCQkJKytzdHI7Ci0JCQlicmVhazsKLQogCQljYXNlIEZP Uk1BVF9UWVBFX0lOVkFMSUQ6CiAJCQlpZiAoc3RyIDwgZW5kKQogCQkJCSpzdHIgPSAnJSc7CkBA IC0xNjY1LDE1ICsxNjU1LDE1IEBAIGludCBic3RyX3ByaW50ZihjaGFyICpidWYsIHNpemVfdCBz aXplLCBjb25zdCBjaGFyICpmbXQsIGNvbnN0IHUzMiAqYmluX2J1ZikKIAkJCS8qIHNraXAgKi8K IAkJCWJyZWFrOwogCi0JCWRlZmF1bHQ6CisJCWRlZmF1bHQ6IHsKKwkJCXVuc2lnbmVkIGxvbmcg bG9uZyBudW07CisKIAkJCXN3aXRjaCAoc3BlYy50eXBlKSB7CiAKIAkJCWNhc2UgRk9STUFUX1RZ UEVfTE9OR19MT05HOgogCQkJCW51bSA9IGdldF9hcmcobG9uZyBsb25nKTsKIAkJCQlicmVhazsK IAkJCWNhc2UgRk9STUFUX1RZUEVfVUxPTkc6Ci0JCQkJbnVtID0gZ2V0X2FyZyh1bnNpZ25lZCBs b25nKTsKLQkJCQlicmVhazsKIAkJCWNhc2UgRk9STUFUX1RZUEVfTE9ORzoKIAkJCQludW0gPSBn ZXRfYXJnKHVuc2lnbmVkIGxvbmcpOwogCQkJCWJyZWFrOwpAQCAtMTcwMyw4ICsxNjkzLDkgQEAg aW50IGJzdHJfcHJpbnRmKGNoYXIgKmJ1Ziwgc2l6ZV90IHNpemUsIGNvbnN0IGNoYXIgKmZtdCwg Y29uc3QgdTMyICpiaW5fYnVmKQogCQkJfQogCiAJCQlzdHIgPSBudW1iZXIoc3RyLCBlbmQsIG51 bSwgc3BlYyk7Ci0JCX0KLQl9CisJCX0gLyogZGVmYXVsdDogKi8KKwkJfSAvKiBzd2l0Y2goc3Bl Yy50eXBlKSAqLworCX0gLyogd2hpbGUoKmZtdCkgKi8KIAogCWlmIChzaXplID4gMCkgewogCQlp ZiAoc3RyIDwgZW5kKQpAQCAtMTc1OCw3ICsxNzQ5LDcgQEAgaW50IHZzc2NhbmYoY29uc3QgY2hh ciAqYnVmLCBjb25zdCBjaGFyICpmbXQsIHZhX2xpc3QgYXJncykKIAljaGFyIGRpZ2l0OwogCWlu dCBudW0gPSAwOwogCWludCBxdWFsaWZpZXIsIGJhc2UsIGZpZWxkX3dpZHRoOwotCWludCBpc19z aWduID0gMDsKKwlib29sIGlzX3NpZ247CiAKIAl3aGlsZSAoKmZtdCAmJiAqc3RyKSB7CiAJCS8q IHNraXAgYW55IHdoaXRlIHNwYWNlIGluIGZvcm1hdCAqLwpAQCAtMTgxNCwxMiArMTgwNSwxMyBA QCBpbnQgdnNzY2FuZihjb25zdCBjaGFyICpidWYsIGNvbnN0IGNoYXIgKmZtdCwgdmFfbGlzdCBh cmdzKQogCQkJCX0KIAkJCX0KIAkJfQotCQliYXNlID0gMTA7Ci0JCWlzX3NpZ24gPSAwOwogCiAJ CWlmICghKmZtdCB8fCAhKnN0cikKIAkJCWJyZWFrOwogCisJCWJhc2UgPSAxMDsKKwkJaXNfc2ln biA9IDA7CisKIAkJc3dpdGNoICgqZm10KyspIHsKIAkJY2FzZSAnYyc6CiAJCXsKLS0gCjEuNi41 LjIuMTUzLmc2ZTMxZi5kaXJ0eQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KQWxzYS1kZXZlbCBtYWlsaW5nIGxpc3QKQWxzYS1kZXZlbEBhbHNhLXByb2pl Y3Qub3JnCmh0dHA6Ly9tYWlsbWFuLmFsc2EtcHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby9h bHNhLWRldmVsCg==