From patchwork Sat Jan 4 17:07:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Roth?= X-Patchwork-Id: 3433901 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C41C89F295 for ; Sat, 4 Jan 2014 17:09:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E817020158 for ; Sat, 4 Jan 2014 17:09:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1558C20145 for ; Sat, 4 Jan 2014 17:09:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754747AbaADRJK (ORCPT ); Sat, 4 Jan 2014 12:09:10 -0500 Received: from mail-ea0-f182.google.com ([209.85.215.182]:32938 "EHLO mail-ea0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754623AbaADRIq (ORCPT ); Sat, 4 Jan 2014 12:08:46 -0500 Received: by mail-ea0-f182.google.com with SMTP id a15so7263511eae.27 for ; Sat, 04 Jan 2014 09:08:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=nZPxICVx4fTbxzDniFqmsr0nLfCX4oP/vdKikFYFnPY=; b=PZS9p88iZmDgtI70hT3+/tsco1gyktr2oyStp5NUCb0UZUBQeXOBBsTxN4r/28vWvD nCeUipxuDIOnWZHavBapIv2sxN+P3loKOVFCBxNrsVYyhlCQxktkauubr20yYABIVspv 1UknMx4TxXubmp2S18IMbjbwg4JFWGHuufdEUFl+TAk4pzGgpao3NrrHVmhl9Rv1SI9c AN16h+IJs5gQVCKMzrkzIGWLi+e342nJrG/lctX3+Iy266krN5WzOKKvqQqgCZjaL2ht NihuZP+Zh2Fg1mwd98DOu6BnWCPmJGdEkNW7GU13fOsoIu1/hxLHin/ShegvquUPvc2r pb2Q== X-Received: by 10.14.119.1 with SMTP id m1mr27101460eeh.39.1388855325304; Sat, 04 Jan 2014 09:08:45 -0800 (PST) Received: from exciton.exnihilo. (140-227.61-188.cust.bluewin.ch. [188.61.227.140]) by mx.google.com with ESMTPSA id e3sm155011641eeg.11.2014.01.04.09.08.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 Jan 2014 09:08:44 -0800 (PST) From: =?UTF-8?q?Andr=C3=A9=20Roth?= To: linux-media@vger.kernel.org Cc: =?UTF-8?q?Andr=C3=A9=20Roth?= Subject: [PATCH 08/11] libdvbv5: make dvb_desc_default_init and dvb_desc_default_print private Date: Sat, 4 Jan 2014 18:07:58 +0100 Message-Id: <1388855282-19295-8-git-send-email-neolynx@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1388855282-19295-1-git-send-email-neolynx@gmail.com> References: <1388855282-19295-1-git-send-email-neolynx@gmail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: André Roth --- lib/include/libdvbv5/descriptors.h | 16 ++++++++-------- lib/libdvbv5/descriptors.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/include/libdvbv5/descriptors.h b/lib/include/libdvbv5/descriptors.h index ae33fda..d5feb4f 100644 --- a/lib/include/libdvbv5/descriptors.h +++ b/lib/include/libdvbv5/descriptors.h @@ -65,14 +65,6 @@ struct dvb_desc { uint8_t data[]; } __attribute__((packed)); -void dvb_desc_default_init(struct dvb_v5_fe_parms *parms, const uint8_t *buf, struct dvb_desc *desc); -#ifdef __cplusplus -extern "C" { -#endif -void dvb_desc_default_print (struct dvb_v5_fe_parms *parms, const struct dvb_desc *desc); -#ifdef __cplusplus -} -#endif #define dvb_desc_foreach( _desc, _tbl ) \ for( struct dvb_desc *_desc = _tbl->descriptor; _desc; _desc = _desc->next ) \ @@ -81,6 +73,10 @@ void dvb_desc_default_print (struct dvb_v5_fe_parms *parms, const struct dvb_de for( _struct *_desc = (_struct *) _tbl->descriptor; _desc; _desc = (_struct *) _desc->next ) \ if(_desc->type == _type) \ +#ifdef __cplusplus +extern "C" { +#endif + uint32_t bcd(uint32_t bcd); void hexdump(struct dvb_v5_fe_parms *parms, const char *prefix, const unsigned char *buf, int len); @@ -89,6 +85,10 @@ void dvb_parse_descriptors(struct dvb_v5_fe_parms *parms, const uint8_t *buf, ui void dvb_free_descriptors(struct dvb_desc **list); void dvb_print_descriptors(struct dvb_v5_fe_parms *parms, struct dvb_desc *desc); +#ifdef __cplusplus +} +#endif + struct dvb_v5_fe_parms; typedef void (*dvb_desc_init_func) (struct dvb_v5_fe_parms *parms, const uint8_t *buf, struct dvb_desc *desc); diff --git a/lib/libdvbv5/descriptors.c b/lib/libdvbv5/descriptors.c index 4bf9d59..48f3fe7 100644 --- a/lib/libdvbv5/descriptors.c +++ b/lib/libdvbv5/descriptors.c @@ -66,12 +66,12 @@ static void dvb_desc_init(uint8_t type, uint8_t length, struct dvb_desc *desc) desc->next = NULL; } -void dvb_desc_default_init(struct dvb_v5_fe_parms *parms, const uint8_t *buf, struct dvb_desc *desc) +static void dvb_desc_default_init(struct dvb_v5_fe_parms *parms, const uint8_t *buf, struct dvb_desc *desc) { memcpy(desc->data, buf, desc->length); } -void dvb_desc_default_print(struct dvb_v5_fe_parms *parms, const struct dvb_desc *desc) +static void dvb_desc_default_print(struct dvb_v5_fe_parms *parms, const struct dvb_desc *desc) { if (!parms) parms = dvb_fe_dummy();