From nobody Mon Feb 9 21:00:43 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@gnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1506730900635270.80791986975396; Fri, 29 Sep 2017 17:21:40 -0700 (PDT) Received: from localhost ([::1]:37484 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dy5X4-0005Ay-FO for importer@patchew.org; Fri, 29 Sep 2017 20:21:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dy5V2-0003mj-IX for qemu-devel@nongnu.org; Fri, 29 Sep 2017 20:19:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dy5Uy-0004HL-Vy for qemu-devel@nongnu.org; Fri, 29 Sep 2017 20:19:20 -0400 Received: from mail-sn1nam01on0046.outbound.protection.outlook.com ([104.47.32.46]:26432 helo=NAM01-SN1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dy5Uy-0004Gu-KO for qemu-devel@nongnu.org; Fri, 29 Sep 2017 20:19:16 -0400 Received: from MWHPR02CA0017.namprd02.prod.outlook.com (2603:10b6:300:4b::27) by BY1PR02MB1130.namprd02.prod.outlook.com (2a01:111:e400:52a7::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Sat, 30 Sep 2017 00:19:12 +0000 Received: from BL2NAM02FT037.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::201) by MWHPR02CA0017.outlook.office365.com (2603:10b6:300:4b::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.8 via Frontend Transport; Sat, 30 Sep 2017 00:19:05 +0000 Received: from xsj-pvapsmtpgw02 (149.199.60.100) by BL2NAM02FT037.mail.protection.outlook.com (10.152.77.11) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.56.11 via Frontend Transport; Sat, 30 Sep 2017 00:19:05 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:39878 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1dy5Um-0000DH-GN; Fri, 29 Sep 2017 17:19:04 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dy5Um-0006sY-DH; Fri, 29 Sep 2017 17:19:04 -0700 Received: from xsj-pvapsmtp01 (mailhost.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v8U0It35032726; Fri, 29 Sep 2017 17:18:55 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dy5Ud-0006os-AH; Fri, 29 Sep 2017 17:18:55 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=fZqAmTrjNQVhGODy0OUIqmXGVEQrv65LbO4j6mMpLV4=; b=HL12lFcLFq21zTyvF+T83HAtuHnhcnN7bBsHPR2VME/FIx+z/hsRu6vlJeCT+ZebNkzhkdrR4rxC5mvPJeUrH9wFK+XxpHiIp//Qph5pAN2xsU5bxGXI3HBquAwiSYDlkVtNOPu3n4cdnYWv+yGcqn9rPu9Rr1tMTMtkg0Hgj3E= Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@gnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.100 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.100; helo=xsj-pvapsmtpgw02; From: Alistair Francis To: Date: Fri, 29 Sep 2017 17:15:08 -0700 Message-ID: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23358.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(346002)(376002)(2980300002)(438002)(189002)(199003)(356003)(8676002)(81156014)(305945005)(478600001)(5660300001)(48376002)(106466001)(63266004)(2351001)(9786002)(106002)(50466002)(36756003)(5003940100001)(76176999)(50986999)(50226002)(36386004)(47776003)(33646002)(118296001)(6666003)(8936002)(39060400002)(575784001)(4326008)(77096006)(189998001)(16586007)(2906002)(54906003)(6916009)(81166006)(5890100001)(316002)(2950100002)(21314002)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY1PR02MB1130; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT037; 1:+VGC5OdFOf1NYm4JlbQB/FF2e+c+JclIe2744axMUk7Kxh/NRaRpWqFACyN8+kODdbkGogbvASGBG/s0BVRjoizh7zF+DCzbQkEEQtOVI5UdBuzF+TWb8F7w2ZnnkSVA MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5cea4589-1c93-4cb7-f903-08d50798dc4c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(8251501002)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:BY1PR02MB1130; X-Microsoft-Exchange-Diagnostics: 1; BY1PR02MB1130; 3:0rEBwNs5W7w0+WVK5rJK2eopM66ZpzucL+qCCANvrLz1PbYHyYKA+YzUl0lqQDP08uPIJbX8itqwWZBBsQdtTp6M1LBsN/fTNbj805Zz0UbT955YYnLJH9+BCPPjM1282Vo7rv4wLs8Ez2ppvVBAgUV4Qjo2xy6ZLPhl1P2w1BwKkpTHru7pRQnpmz8rm50YPaJ95P1HxZyNiUajhWgi4oux2jGt6xsB5rUVIVJMznf61gijPURvGn6Q8sFcycnOHJMFUIyjkWWlYHiC1HFvwUXACVA9XFoE1PRVotIoVzop+PJamOwRRpPiAHPZxqFXOBvXoG1y4oM16Zl+sR6tjDrAPXmhiNjlargCZYgRQfA=; 25:iOUKZi4MAUAQU+Cp2kjX2+mzksE17t0XKDL7iMvoABAx8/HexhvPDmW8TGRvfv0zQtkN/RavsU9yn/geN9S0OE7Z93OPFnkhHaKAcxGdokzZ958KJr2pZgozfHEATsGUz2l/a7/cBtf6D5927XY/ijQK+qUegMOXxb6JhonjmumZpmYK2iT5j0GDGOsaDJ0JuzXIkzRPTgwWhqHyyJ671B1RS+G0aTOM4nyALbOALM9dd6VTpdgz6ey11bhhDZpoWmH0KcD46edqTgJUKF4BjsIA/ABFj16J0JFxoqjUbCs93/5y+7rX3ys5tyTy7BBJR0VJH/mvbmYSpbjiPqS7JQ== X-MS-TrafficTypeDiagnostic: BY1PR02MB1130: X-Microsoft-Exchange-Diagnostics: 1; BY1PR02MB1130; 31:4ywe4MnZ6bVUnpvLrGonKTE5fhpDbdphyXmLCaFAhN/jYJoDP3VBAuCuz43fqikOjYwEAuh0iUUa9Qi7mn3+XIYnIphglr7vSNww6NonUVJd5yA5rFnuqNA/mp9LKPa4NZKGWGJveeLBS+18jT1dRZSmMKDYEAtHDL3p6HvndPc4nICUkl7MDQCX6dhP1+oqpQFsU6PMuT5quYLjdxdH4z9Yir4Vydr2MF/D0MgNCWw=; 20:XNwq7NsLH4wa8pYQxHKJRfd8qAeKhqmdYHrTpTDWhxfuk/H6BsVYIqYa69IE7YzztuY1W+qQP5ZYWhzAyGObLU7NoVkHjso078lgzAleyR3dxfzkUNQ0jSaUb6AkGkiY0fIgb8kgraE+ZMu+hSImdfCCYsluAw2ln/YXlboqe9WakhMOXrMM34nqweKRCyqoYaeIy0Ff1oJrJ5WRfSvZnY77MJ+0BDkZLpECiIid6B5YiAA22BWatDMQ8I2LVMD8IQJUfJQx3OikIrzTHPtoJUdrHvwGarwDBN4rIoqU4gYzWo3rbmZWuOaM3SNJXfKWRBpEuC02+v95aUF+kyBKzB/KwvP7wI77lwJBpCDHb2IxvlbgqhjiQ8Efkjz9Lf6VZoUGVSmLAUKu2283qwLWjCjr9w78FukuRlEH3BACI+KMQbiiY3vDCOIXUdChTIAdadZN/QoYrudyfDdnmaKDKigzSGYRG7G6XA3FzIlN4aNeADP6FTnZuV1z+Fiho4NM X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(93006095)(93004095)(3002001)(10201501046)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123562025)(20161123558100)(20161123555025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BY1PR02MB1130; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BY1PR02MB1130; X-Microsoft-Exchange-Diagnostics: 1; BY1PR02MB1130; 4:f09IIha6WhsRDBgVp7YwxPse/pRAs301j+P6KjIVCEHcKtE3ZoUYJn5P3ouRUvKbUW49Ef7UOwu1e34jaYes19x9iZJj+giJunk7OBB0jDnmLJ3Gcws4ATrxwFeca1DKg5kLAzGcDiKay3vkAttyx4S8d9mZHGWqT2MFuLKkJDveCLeqnBuoOD4jCLl7vUbi2fKowrKi0cnKwZDgLrBcZKUC4jk4OZTIv0OeMrc4IqE7hmypIT5rB/TXZCrjF7j+s/AKd9/6RjMSJuXyHwzkAjPWOJNOnkSlKwyZLYSd9RMm5VgCSwaKJNey/8gqEPBDcehYNvTZ99YprntbSB8HuA== X-Forefront-PRVS: 0446F0FCE1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR02MB1130; 23:C4pGH9b/NgarmRZP364qrpL8yrhiFTy1rBboG7gSl?= =?us-ascii?Q?XdEhYRYdHklJbv6zyHgiydl3FeUkj0LoW2S+bERnSfJhrHuDiVYDvMkyGUVP?= =?us-ascii?Q?txMa+8qJmy7ARHAXabnnCLz27UqlwTMBJaYSJSCBQS7+zQhnwOdUmavJsSHV?= =?us-ascii?Q?Y7CU4du2G1URJEgg/5CDbHt8bAwRkgTve+92YB7o4Isbn+jvZyIawLd9bS02?= =?us-ascii?Q?xz5Bm6bXuRwD0ZhP0qVlW0W9Qx9L7YfnqqrY5Ix94kGLx8MPYCCaarBUBzkL?= =?us-ascii?Q?yHXBdgYi6KOEexieHo81lo7Bni7+vg48vz5QC81MhAZdQMOcCmgTmwOndQBF?= =?us-ascii?Q?/mbOCUA5XhWS3QlVYWdDvej7fKhazzWCmLM9V2jpZXnutTzosO6dlUbIHQLU?= =?us-ascii?Q?8jQuWFTeOIR8pKO3Aru/biEMrsnoJfAf/GzVNzqm9s7DElHvMnh1diV9ZImc?= =?us-ascii?Q?sm0qmbXSJouGW+lqr92tPl6BEcH79qxi920xCP014CLWJdP/esH7j5t4kFZX?= =?us-ascii?Q?qRVZCXYSgZO9SuLVd7gQElx32nI+H/ZD4yppLbEoBovUKotwJ9bcXTmLOTG3?= =?us-ascii?Q?7wnrMpzF4f4QIpxye256zQ8NveP2+Cj9PlZbUZRS53cdaOu+zArAor53sEM4?= =?us-ascii?Q?ek3dotoOAtKj7mjGdL43PNc09aQHzgqB6m8Xy4QkjJEoIc2xlebmkNTPoBY5?= =?us-ascii?Q?ne6z2q/Hrb9RnfahLaHOBaXO5qljXOwAjim2x0WUDIx/SdmwAoiF0+zYmpwn?= =?us-ascii?Q?b/CudMOcUWEJ3uhRsvskD53bTmtiAsuBOBz99EcmU0Rrk0FjVuSOHPdXpdxa?= =?us-ascii?Q?4GfQ39DeLNv5DBzdaTgRiGRaq2+twg8UjN8YxbbDCCjTQmSgk4kh6gEyV1Zy?= =?us-ascii?Q?KFIfxx64eP4Uej6CxOTmN/A5KMqBgr6Bv0X15/0CwlIFR+l+j3wm/ttC5YSu?= =?us-ascii?Q?tDjQgaNblR79sG/UpWAk5Ow4q/Zm/j/7Y8gvarnxkiPaJEsJPo5ucfAsh4FG?= =?us-ascii?Q?R3jlxec70xuJICiv0aqE9gihrarjtBA1yvhpwpPlfnvcwEGMCjfNRoShtRBD?= =?us-ascii?Q?C57LZ8hJja0XsUzXRpFcv/vuLm8WC91VoU+aidyOBQ8M5CVZrqanZpMdzmcY?= =?us-ascii?Q?u9/tZIc7VI=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR02MB1130; 6:qomotmUj2M/tf6pZomWeF9W1wfpc+8jrPSFulAsY3FyvLbgsjJ6bTc5eCxEu2tgp8lmEQwRRVyKKpg/DvnBpz/mJXBX+b7DI7Vw9dIRo38HWpnCR31HgWtUx4fv8F12jIuVaeDGAUCJO7YSyWtxraSbBdNcILJY67TbbbEi1rjdLshQNfx4LhJVXgji8a+A/L0e/UJY3/mVrfOHPjy4972JWw6ws6140HK490z3a+jb+HT8zSpSDbxHmFkkBOqLHnZP0Msv6OGSL3SNXUiUTSfY6WEYYq8jG1A8b+UYFbwZ3NkFKC0Q1rIUdDjjNsLiFQZlo2LGT4vqK39BXChFXRw==; 5:UaPnixeOPLdfw9X9XPTHNmTWZVta8+TBdOBL6TuG1Ea8N8u54zAoRWDdQFS4dxx6s610N1dt+jn9N/AzQHXCOlhfDQBqHsfaMz79Es6cH5NuwEuI9VLhFVP2K/skK4un9oTRKzepjizFrn/Y99oHZRkZVmuJ04QUAeD7Si7ZCSw=; 24:IXr1mgBz09JtHTqFzp4jHCDFG38Uk4JpTHqzYsYaMGAz4Zo8rRmMWycyE/bwsYRYN7AlUgI3Jih+l3vW7X2aWegG9M+JYlBpoepfS5nRvYc=; 7:jIow3xEu5QmwwdrhZbdhql4cuFwnhcZmdGYOfiVF6DdxufYJh9uEEndwc96sSANMWehbNdB6MluYqtDqea2542pKNu4unC4X6CEtzgtVUgBwn2cI1m8yM4DNKQ3AlHkmduLt2wIjHs8vZKMKTdGk4V5X7qK4V99wzghBSVODzZtQu6BDI3KlOVrcCAjjjtm5pfW54bBBM4HLkROlrJ5W2lzjtppHFME9zZVunGVuE5w= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2017 00:19:05.1342 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.100]; Helo=[xsj-pvapsmtpgw02] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR02MB1130 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.32.46 Subject: [Qemu-devel] [PATCH v2 03/47] audio: Replace AUDIO_FUNC with __func__ X-BeenThere: qemu-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, Gerd Hoffmann , armbru@redhat.com, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+importer=patchew.org@gnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Apparently we don't use __MSC_VER as a compiler anymore and we always require a C99 compiler (which means we always have __func__) so we don't need a special AUDIO_FUNC macro. We can just repleace AUDIO_FUNC with __func__ instead. Checkpatch failures where manually fixed. Signed-off-by: Alistair Francis Cc: Gerd Hoffmann Reviewed-by: Eric Blake Reviewed-by: Thomas Huth --- audio/alsaaudio.c | 4 ++-- audio/audio.c | 40 ++++++++++++++++++------------------ audio/audio_int.h | 6 ------ audio/audio_pt_int.c | 28 ++++++++++++------------- audio/audio_template.h | 26 +++++++++++------------ audio/dsoundaudio.c | 2 +- audio/mixeng.c | 2 +- audio/ossaudio.c | 10 ++++----- audio/paaudio.c | 56 +++++++++++++++++++++++++---------------------= ---- audio/sdlaudio.c | 2 +- audio/wavaudio.c | 2 +- 11 files changed, 85 insertions(+), 93 deletions(-) diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c index 3652a7b5fa..92a96f8b2b 100644 --- a/audio/alsaaudio.c +++ b/audio/alsaaudio.c @@ -823,7 +823,7 @@ static int alsa_init_out(HWVoiceOut *hw, struct audsett= ings *as, audio_pcm_init_info (&hw->info, &obt_as); hw->samples =3D obt.samples; =20 - alsa->pcm_buf =3D audio_calloc (AUDIO_FUNC, obt.samples, 1 << hw->info= .shift); + alsa->pcm_buf =3D audio_calloc(__func__, obt.samples, 1 << hw->info.sh= ift); if (!alsa->pcm_buf) { dolog ("Could not allocate DAC buffer (%d samples, each %d bytes)\= n", hw->samples, 1 << hw->info.shift); @@ -934,7 +934,7 @@ static int alsa_init_in(HWVoiceIn *hw, struct audsettin= gs *as, void *drv_opaque) audio_pcm_init_info (&hw->info, &obt_as); hw->samples =3D obt.samples; =20 - alsa->pcm_buf =3D audio_calloc (AUDIO_FUNC, hw->samples, 1 << hw->info= .shift); + alsa->pcm_buf =3D audio_calloc(__func__, hw->samples, 1 << hw->info.sh= ift); if (!alsa->pcm_buf) { dolog ("Could not allocate ADC buffer (%d samples, each %d bytes)\= n", hw->samples, 1 << hw->info.shift); diff --git a/audio/audio.c b/audio/audio.c index beafed209b..7658d2af66 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -424,12 +424,12 @@ static void audio_process_options (const char *prefix, const char qemu_prefix[] =3D "QEMU_"; size_t preflen, optlen; =20 - if (audio_bug (AUDIO_FUNC, !prefix)) { + if (audio_bug(__func__, !prefix)) { dolog ("prefix =3D NULL\n"); return; } =20 - if (audio_bug (AUDIO_FUNC, !opt)) { + if (audio_bug(__func__, !opt)) { dolog ("opt =3D NULL\n"); return; } @@ -792,7 +792,7 @@ static int audio_attach_capture (HWVoiceOut *hw) SWVoiceOut *sw; HWVoiceOut *hw_cap =3D &cap->hw; =20 - sc =3D audio_calloc (AUDIO_FUNC, 1, sizeof (*sc)); + sc =3D audio_calloc(__func__, 1, sizeof(*sc)); if (!sc) { dolog ("Could not allocate soft capture voice (%zu bytes)\n", sizeof (*sc)); @@ -848,7 +848,7 @@ static int audio_pcm_hw_find_min_in (HWVoiceIn *hw) int audio_pcm_hw_get_live_in (HWVoiceIn *hw) { int live =3D hw->total_samples_captured - audio_pcm_hw_find_min_in (hw= ); - if (audio_bug (AUDIO_FUNC, live < 0 || live > hw->samples)) { + if (audio_bug(__func__, live < 0 || live > hw->samples)) { dolog ("live=3D%d hw->samples=3D%d\n", live, hw->samples); return 0; } @@ -886,7 +886,7 @@ static int audio_pcm_sw_get_rpos_in (SWVoiceIn *sw) int live =3D hw->total_samples_captured - sw->total_hw_samples_acquire= d; int rpos; =20 - if (audio_bug (AUDIO_FUNC, live < 0 || live > hw->samples)) { + if (audio_bug(__func__, live < 0 || live > hw->samples)) { dolog ("live=3D%d hw->samples=3D%d\n", live, hw->samples); return 0; } @@ -909,7 +909,7 @@ int audio_pcm_sw_read (SWVoiceIn *sw, void *buf, int si= ze) rpos =3D audio_pcm_sw_get_rpos_in (sw) % hw->samples; =20 live =3D hw->total_samples_captured - sw->total_hw_samples_acquired; - if (audio_bug (AUDIO_FUNC, live < 0 || live > hw->samples)) { + if (audio_bug(__func__, live < 0 || live > hw->samples)) { dolog ("live_in=3D%d hw->samples=3D%d\n", live, hw->samples); return 0; } @@ -935,7 +935,7 @@ int audio_pcm_sw_read (SWVoiceIn *sw, void *buf, int si= ze) } osamp =3D swlim; =20 - if (audio_bug (AUDIO_FUNC, osamp < 0)) { + if (audio_bug(__func__, osamp < 0)) { dolog ("osamp=3D%d\n", osamp); return 0; } @@ -990,7 +990,7 @@ static int audio_pcm_hw_get_live_out (HWVoiceOut *hw, i= nt *nb_live) if (nb_live1) { int live =3D smin; =20 - if (audio_bug (AUDIO_FUNC, live < 0 || live > hw->samples)) { + if (audio_bug(__func__, live < 0 || live > hw->samples)) { dolog ("live=3D%d hw->samples=3D%d\n", live, hw->samples); return 0; } @@ -1014,7 +1014,7 @@ int audio_pcm_sw_write (SWVoiceOut *sw, void *buf, in= t size) hwsamples =3D sw->hw->samples; =20 live =3D sw->total_hw_samples_mixed; - if (audio_bug (AUDIO_FUNC, live < 0 || live > hwsamples)){ + if (audio_bug(__func__, live < 0 || live > hwsamples)) { dolog ("live=3D%d hw->samples=3D%d\n", live, hwsamples); return 0; } @@ -1263,7 +1263,7 @@ static int audio_get_avail (SWVoiceIn *sw) } =20 live =3D sw->hw->total_samples_captured - sw->total_hw_samples_acquire= d; - if (audio_bug (AUDIO_FUNC, live < 0 || live > sw->hw->samples)) { + if (audio_bug(__func__, live < 0 || live > sw->hw->samples)) { dolog ("live=3D%d sw->hw->samples=3D%d\n", live, sw->hw->samples); return 0; } @@ -1287,7 +1287,7 @@ static int audio_get_free (SWVoiceOut *sw) =20 live =3D sw->total_hw_samples_mixed; =20 - if (audio_bug (AUDIO_FUNC, live < 0 || live > sw->hw->samples)) { + if (audio_bug(__func__, live < 0 || live > sw->hw->samples)) { dolog ("live=3D%d sw->hw->samples=3D%d\n", live, sw->hw->samples); return 0; } @@ -1354,7 +1354,7 @@ static void audio_run_out (AudioState *s) live =3D 0; } =20 - if (audio_bug (AUDIO_FUNC, live < 0 || live > hw->samples)) { + if (audio_bug(__func__, live < 0 || live > hw->samples)) { dolog ("live=3D%d hw->samples=3D%d\n", live, hw->samples); continue; } @@ -1389,7 +1389,7 @@ static void audio_run_out (AudioState *s) prev_rpos =3D hw->rpos; played =3D hw->pcm_ops->run_out (hw, live); replay_audio_out(&played); - if (audio_bug (AUDIO_FUNC, hw->rpos >=3D hw->samples)) { + if (audio_bug(__func__, hw->rpos >=3D hw->samples)) { dolog ("hw->rpos=3D%d hw->samples=3D%d played=3D%d\n", hw->rpos, hw->samples, played); hw->rpos =3D 0; @@ -1410,7 +1410,7 @@ static void audio_run_out (AudioState *s) continue; } =20 - if (audio_bug (AUDIO_FUNC, played > sw->total_hw_samples_mixed= )) { + if (audio_bug(__func__, played > sw->total_hw_samples_mixed)) { dolog ("played=3D%d sw->total_hw_samples_mixed=3D%d\n", played, sw->total_hw_samples_mixed); played =3D sw->total_hw_samples_mixed; @@ -1513,7 +1513,7 @@ static void audio_run_capture (AudioState *s) continue; } =20 - if (audio_bug (AUDIO_FUNC, captured > sw->total_hw_samples_mix= ed)) { + if (audio_bug(__func__, captured > sw->total_hw_samples_mixed)= ) { dolog ("captured=3D%d sw->total_hw_samples_mixed=3D%d\n", captured, sw->total_hw_samples_mixed); captured =3D sw->total_hw_samples_mixed; @@ -1924,7 +1924,7 @@ CaptureVoiceOut *AUD_add_capture ( goto err0; } =20 - cb =3D audio_calloc (AUDIO_FUNC, 1, sizeof (*cb)); + cb =3D audio_calloc(__func__, 1, sizeof(*cb)); if (!cb) { dolog ("Could not allocate capture callback information, size %zu\= n", sizeof (*cb)); @@ -1942,7 +1942,7 @@ CaptureVoiceOut *AUD_add_capture ( HWVoiceOut *hw; CaptureVoiceOut *cap; =20 - cap =3D audio_calloc (AUDIO_FUNC, 1, sizeof (*cap)); + cap =3D audio_calloc(__func__, 1, sizeof(*cap)); if (!cap) { dolog ("Could not allocate capture voice, size %zu\n", sizeof (*cap)); @@ -1955,8 +1955,8 @@ CaptureVoiceOut *AUD_add_capture ( =20 /* XXX find a more elegant way */ hw->samples =3D 4096 * 4; - hw->mix_buf =3D audio_calloc (AUDIO_FUNC, hw->samples, - sizeof (struct st_sample)); + hw->mix_buf =3D audio_calloc(__func__, hw->samples, + sizeof(struct st_sample)); if (!hw->mix_buf) { dolog ("Could not allocate capture mix buffer (%d samples)\n", hw->samples); @@ -1965,7 +1965,7 @@ CaptureVoiceOut *AUD_add_capture ( =20 audio_pcm_init_info (&hw->info, as); =20 - cap->buf =3D audio_calloc (AUDIO_FUNC, hw->samples, 1 << hw->info.= shift); + cap->buf =3D audio_calloc(__func__, hw->samples, 1 << hw->info.shi= ft); if (!cap->buf) { dolog ("Could not allocate capture buffer " "(%d samples, each %d bytes)\n", diff --git a/audio/audio_int.h b/audio/audio_int.h index 543b1bd8d5..5b25da0a37 100644 --- a/audio/audio_int.h +++ b/audio/audio_int.h @@ -252,10 +252,4 @@ static inline int audio_ring_dist (int dst, int src, i= nt len) #define AUDIO_STRINGIFY_(n) #n #define AUDIO_STRINGIFY(n) AUDIO_STRINGIFY_(n) =20 -#if defined _MSC_VER || defined __GNUC__ -#define AUDIO_FUNC __func__ -#else -#define AUDIO_FUNC __FILE__ ":" AUDIO_STRINGIFY (__LINE__) -#endif - #endif /* QEMU_AUDIO_INT_H */ diff --git a/audio/audio_pt_int.c b/audio/audio_pt_int.c index 21ff9c5803..3fe56d8514 100644 --- a/audio/audio_pt_int.c +++ b/audio/audio_pt_int.c @@ -31,7 +31,7 @@ int audio_pt_init (struct audio_pt *p, void *(*func) (voi= d *), =20 err =3D sigfillset (&set); if (err) { - logerr (p, errno, "%s(%s): sigfillset failed", cap, AUDIO_FUNC); + logerr(p, errno, "%s(%s): sigfillset failed", cap, __func__); return -1; } =20 @@ -57,8 +57,8 @@ int audio_pt_init (struct audio_pt *p, void *(*func) (voi= d *), =20 err2 =3D pthread_sigmask (SIG_SETMASK, &old_set, NULL); if (err2) { - logerr (p, err2, "%s(%s): pthread_sigmask (restore) failed", - cap, AUDIO_FUNC); + logerr(p, err2, "%s(%s): pthread_sigmask (restore) failed", + cap, __func__); /* We have failed to restore original signal mask, all bets are of= f, so terminate the process */ exit (EXIT_FAILURE); @@ -74,17 +74,17 @@ int audio_pt_init (struct audio_pt *p, void *(*func) (v= oid *), err2: err2 =3D pthread_cond_destroy (&p->cond); if (err2) { - logerr (p, err2, "%s(%s): pthread_cond_destroy failed", cap, AUDIO= _FUNC); + logerr(p, err2, "%s(%s): pthread_cond_destroy failed", cap, __func= __); } =20 err1: err2 =3D pthread_mutex_destroy (&p->mutex); if (err2) { - logerr (p, err2, "%s(%s): pthread_mutex_destroy failed", cap, AUDI= O_FUNC); + logerr(p, err2, "%s(%s): pthread_mutex_destroy failed", cap, __fun= c__); } =20 err0: - logerr (p, err, "%s(%s): %s failed", cap, AUDIO_FUNC, efunc); + logerr(p, err, "%s(%s): %s failed", cap, __func__, efunc); return -1; } =20 @@ -94,13 +94,13 @@ int audio_pt_fini (struct audio_pt *p, const char *cap) =20 err =3D pthread_cond_destroy (&p->cond); if (err) { - logerr (p, err, "%s(%s): pthread_cond_destroy failed", cap, AUDIO_= FUNC); + logerr(p, err, "%s(%s): pthread_cond_destroy failed", cap, __func_= _); ret =3D -1; } =20 err =3D pthread_mutex_destroy (&p->mutex); if (err) { - logerr (p, err, "%s(%s): pthread_mutex_destroy failed", cap, AUDIO= _FUNC); + logerr(p, err, "%s(%s): pthread_mutex_destroy failed", cap, __func= __); ret =3D -1; } return ret; @@ -112,7 +112,7 @@ int audio_pt_lock (struct audio_pt *p, const char *cap) =20 err =3D pthread_mutex_lock (&p->mutex); if (err) { - logerr (p, err, "%s(%s): pthread_mutex_lock failed", cap, AUDIO_FU= NC); + logerr(p, err, "%s(%s): pthread_mutex_lock failed", cap, __func__); return -1; } return 0; @@ -124,7 +124,7 @@ int audio_pt_unlock (struct audio_pt *p, const char *ca= p) =20 err =3D pthread_mutex_unlock (&p->mutex); if (err) { - logerr (p, err, "%s(%s): pthread_mutex_unlock failed", cap, AUDIO_= FUNC); + logerr(p, err, "%s(%s): pthread_mutex_unlock failed", cap, __func_= _); return -1; } return 0; @@ -136,7 +136,7 @@ int audio_pt_wait (struct audio_pt *p, const char *cap) =20 err =3D pthread_cond_wait (&p->cond, &p->mutex); if (err) { - logerr (p, err, "%s(%s): pthread_cond_wait failed", cap, AUDIO_FUN= C); + logerr(p, err, "%s(%s): pthread_cond_wait failed", cap, __func__); return -1; } return 0; @@ -148,12 +148,12 @@ int audio_pt_unlock_and_signal (struct audio_pt *p, c= onst char *cap) =20 err =3D pthread_mutex_unlock (&p->mutex); if (err) { - logerr (p, err, "%s(%s): pthread_mutex_unlock failed", cap, AUDIO_= FUNC); + logerr(p, err, "%s(%s): pthread_mutex_unlock failed", cap, __func_= _); return -1; } err =3D pthread_cond_signal (&p->cond); if (err) { - logerr (p, err, "%s(%s): pthread_cond_signal failed", cap, AUDIO_F= UNC); + logerr(p, err, "%s(%s): pthread_cond_signal failed", cap, __func__= ); return -1; } return 0; @@ -166,7 +166,7 @@ int audio_pt_join (struct audio_pt *p, void **arg, cons= t char *cap) =20 err =3D pthread_join (p->thread, &ret); if (err) { - logerr (p, err, "%s(%s): pthread_join failed", cap, AUDIO_FUNC); + logerr(p, err, "%s(%s): pthread_join failed", cap, __func__); return -1; } *arg =3D ret; diff --git a/audio/audio_template.h b/audio/audio_template.h index 99b27b285e..7de227d2d1 100644 --- a/audio/audio_template.h +++ b/audio/audio_template.h @@ -57,13 +57,13 @@ static void glue (audio_init_nb_voices_, TYPE) (struct = audio_driver *drv) glue (s->nb_hw_voices_, TYPE) =3D max_voices; } =20 - if (audio_bug (AUDIO_FUNC, !voice_size && max_voices)) { + if (audio_bug(__func__, !voice_size && max_voices)) { dolog ("drv=3D`%s' voice_size=3D0 max_voices=3D%d\n", drv->name, max_voices); glue (s->nb_hw_voices_, TYPE) =3D 0; } =20 - if (audio_bug (AUDIO_FUNC, voice_size && !max_voices)) { + if (audio_bug(__func__, voice_size && !max_voices)) { dolog ("drv=3D`%s' voice_size=3D%d max_voices=3D0\n", drv->name, voice_size); } @@ -77,7 +77,7 @@ static void glue (audio_pcm_hw_free_resources_, TYPE) (HW= *hw) =20 static int glue (audio_pcm_hw_alloc_resources_, TYPE) (HW *hw) { - HWBUF =3D audio_calloc (AUDIO_FUNC, hw->samples, sizeof (struct st_sam= ple)); + HWBUF =3D audio_calloc(__func__, hw->samples, sizeof(struct st_sample)= ); if (!HWBUF) { dolog ("Could not allocate " NAME " buffer (%d samples)\n", hw->samples); @@ -105,7 +105,7 @@ static int glue (audio_pcm_sw_alloc_resources_, TYPE) (= SW *sw) =20 samples =3D ((int64_t) sw->hw->samples << 32) / sw->ratio; =20 - sw->buf =3D audio_calloc (AUDIO_FUNC, samples, sizeof (struct st_sampl= e)); + sw->buf =3D audio_calloc(__func__, samples, sizeof(struct st_sample)); if (!sw->buf) { dolog ("Could not allocate buffer for `%s' (%d samples)\n", SW_NAME (sw), samples); @@ -238,17 +238,17 @@ static HW *glue (audio_pcm_hw_add_new_, TYPE) (struct= audsettings *as) return NULL; } =20 - if (audio_bug (AUDIO_FUNC, !drv)) { + if (audio_bug(__func__, !drv)) { dolog ("No host audio driver\n"); return NULL; } =20 - if (audio_bug (AUDIO_FUNC, !drv->pcm_ops)) { + if (audio_bug(__func__, !drv->pcm_ops)) { dolog ("Host audio driver without pcm_ops\n"); return NULL; } =20 - hw =3D audio_calloc (AUDIO_FUNC, 1, glue (drv->voice_size_, TYPE)); + hw =3D audio_calloc(__func__, 1, glue(drv->voice_size_, TYPE)); if (!hw) { dolog ("Can not allocate voice `%s' size %d\n", drv->name, glue (drv->voice_size_, TYPE)); @@ -266,7 +266,7 @@ static HW *glue (audio_pcm_hw_add_new_, TYPE) (struct a= udsettings *as) goto err0; } =20 - if (audio_bug (AUDIO_FUNC, hw->samples <=3D 0)) { + if (audio_bug(__func__, hw->samples <=3D 0)) { dolog ("hw->samples=3D%d\n", hw->samples); goto err1; } @@ -339,7 +339,7 @@ static SW *glue (audio_pcm_create_voice_pair_, TYPE) ( hw_as =3D *as; } =20 - sw =3D audio_calloc (AUDIO_FUNC, 1, sizeof (*sw)); + sw =3D audio_calloc(__func__, 1, sizeof(*sw)); if (!sw) { dolog ("Could not allocate soft voice `%s' (%zu bytes)\n", sw_name ? sw_name : "unknown", sizeof (*sw)); @@ -379,7 +379,7 @@ static void glue (audio_close_, TYPE) (SW *sw) void glue (AUD_close_, TYPE) (QEMUSoundCard *card, SW *sw) { if (sw) { - if (audio_bug (AUDIO_FUNC, !card)) { + if (audio_bug(__func__, !card)) { dolog ("card=3D%p\n", card); return; } @@ -399,7 +399,7 @@ SW *glue (AUD_open_, TYPE) ( { AudioState *s =3D &glob_audio_state; =20 - if (audio_bug (AUDIO_FUNC, !card || !name || !callback_fn || !as)) { + if (audio_bug(__func__, !card || !name || !callback_fn || !as)) { dolog ("card=3D%p name=3D%p callback_fn=3D%p as=3D%p\n", card, name, callback_fn, as); goto fail; @@ -408,12 +408,12 @@ SW *glue (AUD_open_, TYPE) ( ldebug ("open %s, freq %d, nchannels %d, fmt %d\n", name, as->freq, as->nchannels, as->fmt); =20 - if (audio_bug (AUDIO_FUNC, audio_validate_settings (as))) { + if (audio_bug(__func__, audio_validate_settings(as))) { audio_print_settings (as); goto fail; } =20 - if (audio_bug (AUDIO_FUNC, !s->drv)) { + if (audio_bug(__func__, !s->drv)) { dolog ("Can not open `%s' (no host audio driver)\n", name); goto fail; } diff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c index 516846eb80..bc39cb9b4d 100644 --- a/audio/dsoundaudio.c +++ b/audio/dsoundaudio.c @@ -543,7 +543,7 @@ static int dsound_run_out (HWVoiceOut *hw, int live) } } =20 - if (audio_bug (AUDIO_FUNC, len < 0 || len > bufsize)) { + if (audio_bug(__func__, len < 0 || len > bufsize)) { dolog ("len=3D%d bufsize=3D%d old_pos=3D%ld ppos=3D%ld\n", len, bufsize, old_pos, ppos); return 0; diff --git a/audio/mixeng.c b/audio/mixeng.c index 0bf9b5360f..2ab22df2aa 100644 --- a/audio/mixeng.c +++ b/audio/mixeng.c @@ -344,7 +344,7 @@ struct rate { */ void *st_rate_start (int inrate, int outrate) { - struct rate *rate =3D audio_calloc (AUDIO_FUNC, 1, sizeof (*rate)); + struct rate *rate =3D audio_calloc(__func__, 1, sizeof(*rate)); =20 if (!rate) { dolog ("Could not allocate resampler (%zu bytes)\n", sizeof (*rate= )); diff --git a/audio/ossaudio.c b/audio/ossaudio.c index 0edd7ea5fe..a0428881c2 100644 --- a/audio/ossaudio.c +++ b/audio/ossaudio.c @@ -582,11 +582,9 @@ static int oss_init_out(HWVoiceOut *hw, struct audsett= ings *as, } =20 if (!oss->mmapped) { - oss->pcm_buf =3D audio_calloc ( - AUDIO_FUNC, - hw->samples, - 1 << hw->info.shift - ); + oss->pcm_buf =3D audio_calloc(__func__, + hw->samples, + 1 << hw->info.shift); if (!oss->pcm_buf) { dolog ( "Could not allocate DAC buffer (%d samples, each %d bytes)= \n", @@ -705,7 +703,7 @@ static int oss_init_in(HWVoiceIn *hw, struct audsetting= s *as, void *drv_opaque) } =20 hw->samples =3D (obt.nfrags * obt.fragsize) >> hw->info.shift; - oss->pcm_buf =3D audio_calloc (AUDIO_FUNC, hw->samples, 1 << hw->info.= shift); + oss->pcm_buf =3D audio_calloc(__func__, hw->samples, 1 << hw->info.shi= ft); if (!oss->pcm_buf) { dolog ("Could not allocate ADC buffer (%d samples, each %d bytes)\= n", hw->samples, 1 << hw->info.shift); diff --git a/audio/paaudio.c b/audio/paaudio.c index 65beb6f010..8cf19c51d0 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -206,7 +206,7 @@ static void *qpa_thread_out (void *arg) PAVoiceOut *pa =3D arg; HWVoiceOut *hw =3D &pa->hw; =20 - if (audio_pt_lock (&pa->pt, AUDIO_FUNC)) { + if (audio_pt_lock(&pa->pt, __func__)) { return NULL; } =20 @@ -222,7 +222,7 @@ static void *qpa_thread_out (void *arg) break; } =20 - if (audio_pt_wait (&pa->pt, AUDIO_FUNC)) { + if (audio_pt_wait(&pa->pt, __func__)) { goto exit; } } @@ -230,7 +230,7 @@ static void *qpa_thread_out (void *arg) decr =3D to_mix =3D audio_MIN (pa->live, pa->g->conf.samples >> 2); rpos =3D pa->rpos; =20 - if (audio_pt_unlock (&pa->pt, AUDIO_FUNC)) { + if (audio_pt_unlock(&pa->pt, __func__)) { return NULL; } =20 @@ -251,7 +251,7 @@ static void *qpa_thread_out (void *arg) to_mix -=3D chunk; } =20 - if (audio_pt_lock (&pa->pt, AUDIO_FUNC)) { + if (audio_pt_lock(&pa->pt, __func__)) { return NULL; } =20 @@ -261,7 +261,7 @@ static void *qpa_thread_out (void *arg) } =20 exit: - audio_pt_unlock (&pa->pt, AUDIO_FUNC); + audio_pt_unlock(&pa->pt, __func__); return NULL; } =20 @@ -270,7 +270,7 @@ static int qpa_run_out (HWVoiceOut *hw, int live) int decr; PAVoiceOut *pa =3D (PAVoiceOut *) hw; =20 - if (audio_pt_lock (&pa->pt, AUDIO_FUNC)) { + if (audio_pt_lock(&pa->pt, __func__)) { return 0; } =20 @@ -279,10 +279,10 @@ static int qpa_run_out (HWVoiceOut *hw, int live) pa->live =3D live - decr; hw->rpos =3D pa->rpos; if (pa->live > 0) { - audio_pt_unlock_and_signal (&pa->pt, AUDIO_FUNC); + audio_pt_unlock_and_signal(&pa->pt, __func__); } else { - audio_pt_unlock (&pa->pt, AUDIO_FUNC); + audio_pt_unlock(&pa->pt, __func__); } return decr; } @@ -298,7 +298,7 @@ static void *qpa_thread_in (void *arg) PAVoiceIn *pa =3D arg; HWVoiceIn *hw =3D &pa->hw; =20 - if (audio_pt_lock (&pa->pt, AUDIO_FUNC)) { + if (audio_pt_lock(&pa->pt, __func__)) { return NULL; } =20 @@ -314,7 +314,7 @@ static void *qpa_thread_in (void *arg) break; } =20 - if (audio_pt_wait (&pa->pt, AUDIO_FUNC)) { + if (audio_pt_wait(&pa->pt, __func__)) { goto exit; } } @@ -322,7 +322,7 @@ static void *qpa_thread_in (void *arg) incr =3D to_grab =3D audio_MIN (pa->dead, pa->g->conf.samples >> 2= ); wpos =3D pa->wpos; =20 - if (audio_pt_unlock (&pa->pt, AUDIO_FUNC)) { + if (audio_pt_unlock(&pa->pt, __func__)) { return NULL; } =20 @@ -342,7 +342,7 @@ static void *qpa_thread_in (void *arg) to_grab -=3D chunk; } =20 - if (audio_pt_lock (&pa->pt, AUDIO_FUNC)) { + if (audio_pt_lock(&pa->pt, __func__)) { return NULL; } =20 @@ -352,7 +352,7 @@ static void *qpa_thread_in (void *arg) } =20 exit: - audio_pt_unlock (&pa->pt, AUDIO_FUNC); + audio_pt_unlock(&pa->pt, __func__); return NULL; } =20 @@ -361,7 +361,7 @@ static int qpa_run_in (HWVoiceIn *hw) int live, incr, dead; PAVoiceIn *pa =3D (PAVoiceIn *) hw; =20 - if (audio_pt_lock (&pa->pt, AUDIO_FUNC)) { + if (audio_pt_lock(&pa->pt, __func__)) { return 0; } =20 @@ -372,10 +372,10 @@ static int qpa_run_in (HWVoiceIn *hw) pa->dead =3D dead - incr; hw->wpos =3D pa->wpos; if (pa->dead > 0) { - audio_pt_unlock_and_signal (&pa->pt, AUDIO_FUNC); + audio_pt_unlock_and_signal(&pa->pt, __func__); } else { - audio_pt_unlock (&pa->pt, AUDIO_FUNC); + audio_pt_unlock(&pa->pt, __func__); } return incr; } @@ -579,7 +579,7 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsetti= ngs *as, =20 audio_pcm_init_info (&hw->info, &obt_as); hw->samples =3D g->conf.samples; - pa->pcm_buf =3D audio_calloc (AUDIO_FUNC, hw->samples, 1 << hw->info.s= hift); + pa->pcm_buf =3D audio_calloc(__func__, hw->samples, 1 << hw->info.shif= t); pa->rpos =3D hw->rpos; if (!pa->pcm_buf) { dolog ("Could not allocate buffer (%d bytes)\n", @@ -587,7 +587,7 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsetti= ngs *as, goto fail2; } =20 - if (audio_pt_init (&pa->pt, qpa_thread_out, hw, AUDIO_CAP, AUDIO_FUNC)= ) { + if (audio_pt_init(&pa->pt, qpa_thread_out, hw, AUDIO_CAP, __func__)) { goto fail3; } =20 @@ -636,7 +636,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsetting= s *as, void *drv_opaque) =20 audio_pcm_init_info (&hw->info, &obt_as); hw->samples =3D g->conf.samples; - pa->pcm_buf =3D audio_calloc (AUDIO_FUNC, hw->samples, 1 << hw->info.s= hift); + pa->pcm_buf =3D audio_calloc(__func__, hw->samples, 1 << hw->info.shif= t); pa->wpos =3D hw->wpos; if (!pa->pcm_buf) { dolog ("Could not allocate buffer (%d bytes)\n", @@ -644,7 +644,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsetting= s *as, void *drv_opaque) goto fail2; } =20 - if (audio_pt_init (&pa->pt, qpa_thread_in, hw, AUDIO_CAP, AUDIO_FUNC))= { + if (audio_pt_init(&pa->pt, qpa_thread_in, hw, AUDIO_CAP, __func__)) { goto fail3; } =20 @@ -667,17 +667,17 @@ static void qpa_fini_out (HWVoiceOut *hw) void *ret; PAVoiceOut *pa =3D (PAVoiceOut *) hw; =20 - audio_pt_lock (&pa->pt, AUDIO_FUNC); + audio_pt_lock(&pa->pt, __func__); pa->done =3D 1; - audio_pt_unlock_and_signal (&pa->pt, AUDIO_FUNC); - audio_pt_join (&pa->pt, &ret, AUDIO_FUNC); + audio_pt_unlock_and_signal(&pa->pt, __func__); + audio_pt_join(&pa->pt, &ret, __func__); =20 if (pa->stream) { pa_stream_unref (pa->stream); pa->stream =3D NULL; } =20 - audio_pt_fini (&pa->pt, AUDIO_FUNC); + audio_pt_fini(&pa->pt, __func__); g_free (pa->pcm_buf); pa->pcm_buf =3D NULL; } @@ -687,17 +687,17 @@ static void qpa_fini_in (HWVoiceIn *hw) void *ret; PAVoiceIn *pa =3D (PAVoiceIn *) hw; =20 - audio_pt_lock (&pa->pt, AUDIO_FUNC); + audio_pt_lock(&pa->pt, __func__); pa->done =3D 1; - audio_pt_unlock_and_signal (&pa->pt, AUDIO_FUNC); - audio_pt_join (&pa->pt, &ret, AUDIO_FUNC); + audio_pt_unlock_and_signal(&pa->pt, __func__); + audio_pt_join(&pa->pt, &ret, __func__); =20 if (pa->stream) { pa_stream_unref (pa->stream); pa->stream =3D NULL; } =20 - audio_pt_fini (&pa->pt, AUDIO_FUNC); + audio_pt_fini(&pa->pt, __func__); g_free (pa->pcm_buf); pa->pcm_buf =3D NULL; } diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c index e8d91d22af..e92135bd2f 100644 --- a/audio/sdlaudio.c +++ b/audio/sdlaudio.c @@ -277,7 +277,7 @@ static void sdl_callback (void *opaque, Uint8 *buf, int= len) return; } =20 - if (audio_bug (AUDIO_FUNC, sdl->live < 0 || sdl->live > hw->sample= s)) { + if (audio_bug(__func__, sdl->live < 0 || sdl->live > hw->samples))= { dolog ("sdl->live=3D%d hw->samples=3D%d\n", sdl->live, hw->samples); return; diff --git a/audio/wavaudio.c b/audio/wavaudio.c index 341eec3121..068a595732 100644 --- a/audio/wavaudio.c +++ b/audio/wavaudio.c @@ -139,7 +139,7 @@ static int wav_init_out(HWVoiceOut *hw, struct audsetti= ngs *as, audio_pcm_init_info (&hw->info, &wav_as); =20 hw->samples =3D 1024; - wav->pcm_buf =3D audio_calloc (AUDIO_FUNC, hw->samples, 1 << hw->info.= shift); + wav->pcm_buf =3D audio_calloc(__func__, hw->samples, 1 << hw->info.shi= ft); if (!wav->pcm_buf) { dolog ("Could not allocate buffer (%d bytes)\n", hw->samples << hw->info.shift); --=20 2.11.0