From patchwork Mon Oct 25 21:46:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 493 Return-Path: Received: from nm17-vm0.bullet.mail.ukl.yahoo.com (nm17-vm0.bullet.mail.ukl.yahoo.com [217.146.183.93]) by open-mesh.org (Postfix) with SMTP id E9073154534 for ; Mon, 25 Oct 2010 23:48:04 +0200 (CEST) Received: from [217.146.183.212] by nm17.bullet.mail.ukl.yahoo.com with NNFMP; 25 Oct 2010 21:48:03 -0000 Received: from [217.146.183.40] by tm5.bullet.mail.ukl.yahoo.com with NNFMP; 25 Oct 2010 21:48:03 -0000 Received: from [127.0.0.1] by omp1025.mail.ukl.yahoo.com with NNFMP; 25 Oct 2010 21:48:03 -0000 X-Yahoo-Newman-Id: 80236.76681.bm@omp1025.mail.ukl.yahoo.com Received: (qmail 69465 invoked from network); 25 Oct 2010 21:48:03 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.de; h=DKIM-Signature:Received:X-Yahoo-SMTP:X-YMail-OSG:X-Yahoo-Newman-Property:From:To:Cc:Subject:Date:Message-Id:X-Mailer; b=w+SP2MG42cFicftN1Zc2ozav6omA/wcjolLy6ckiafr51lEyU4rIpcEnXMmhbIZ1hrijj86DkshjZHf9goDsyrampwQO5k5Iu21QKutNoy25D51f0VagMzDuqeaGULL5u6m/GGk4nGW4o7YUntj7Zx8hMlGUHiZ7UuxOQD29XT0= ; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1288043283; bh=1e0GlzHNHE2wpITjgZ3MqKxQcL2JyRwnLIGA3zd3FJ0=; h=Received:X-Yahoo-SMTP:X-YMail-OSG:X-Yahoo-Newman-Property:From:To:Cc:Subject:Date:Message-Id:X-Mailer; b=uGh81+j5RHeQWR439jDae/wCsPWn3pbwXG9jfw8qvgnzAHJbfzJH4puURIa2YLLeRTvzZwp5JiORvHwpBwAhUmKEme3HW8ajBdII03CLLGcOjwZhGqLVS6pr1X6uaioGY39M//wX+wQaK0hy5r9lhDrJW9uFUhCzSHRaz5JVJfQ= Received: from localhost (lindner_marek@78.225.40.81 with plain) by smtp125.mail.ukl.yahoo.com with SMTP; 25 Oct 2010 14:48:02 -0700 PDT X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- X-YMail-OSG: 7Z.yHlwVM1nY9bDoxJkWF5SxuQkosR2F5lnIotyN8A88zcW .hhbu5PmS1w2FUb_Xqw2w2Z2X1zGuS2PeW7IenZwezReByV4_AcNPBf4VkeI 6fZnXBOVJ2tOqFX6Ne.wIEZCeLbjktEt2f.f6FospmTSIqEvRwfjJxFk.yJq Mhv17ikyAfnBTwJKmnPEqVJCkgfl5DePiEZcbCHd1cV9i4eLtVWCbq4W0Fxa gsVmvJzifgKZaWtOAcB0Qu.q6ozyt9vj1GHh48ZKVjGGqZuzq X-Yahoo-Newman-Property: ymail-3 From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Mon, 25 Oct 2010 23:46:05 +0200 Message-Id: <1288043165-8144-1-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.1 Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: add seq_printf() wrapper for older kernels that don't support %pM X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Oct 2010 21:48:05 -0000 Signed-off-by: Marek Lindner Acked-by: Sven Eckelmann --- batman-adv/bat_printk.c | 18 ++++++++++++++++++ batman-adv/compat.h | 3 +++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/batman-adv/bat_printk.c b/batman-adv/bat_printk.c index 4fa3e18..69a7f95 100644 --- a/batman-adv/bat_printk.c +++ b/batman-adv/bat_printk.c @@ -935,3 +935,21 @@ int bat_snprintf(char *buf, size_t size, const char *fmt, ...) return i; } + +int bat_seq_printf(struct seq_file *m, const char *f, ...) +{ + va_list args; + int len; + + if (m->count < m->size) { + va_start(args, f); + len = bat_vsnprintf(m->buf + m->count, m->size - m->count, f, args); + va_end(args); + if (m->count + len < m->size) { + m->count += len; + return 0; + } + } + m->count = m->size; + return -1; +} diff --git a/batman-adv/compat.h b/batman-adv/compat.h index da474e4..b01455f 100644 --- a/batman-adv/compat.h +++ b/batman-adv/compat.h @@ -259,6 +259,9 @@ int bat_sprintf(char *buf, const char *fmt, ...); int bat_snprintf(char *buf, size_t size, const char *fmt, ...); #define snprintf bat_snprintf +int bat_seq_printf(struct seq_file *m, const char *f, ...); +#define seq_printf bat_seq_printf + #endif /* < KERNEL_VERSION(2, 6, 29) */ #endif /* _NET_BATMAN_ADV_COMPAT_H_ */