From patchwork Thu Jan 22 00:27:01 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Levand X-Patchwork-Id: 19745 X-Patchwork-Delegate: jk@ozlabs.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 89536DDF63 for ; Thu, 22 Jan 2009 14:37:39 +1100 (EST) X-Original-To: cbe-oss-dev@ozlabs.org Delivered-To: cbe-oss-dev@ozlabs.org Received: from hera.kernel.org (hera.kernel.org [140.211.167.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AC393DDF5A; Thu, 22 Jan 2009 14:31:59 +1100 (EST) Received: from hera.kernel.org (IDENT:U2FsdGVkX19lriGA3RXacIzX4mzzc06lYM13iUR1VI4@localhost [127.0.0.1]) by hera.kernel.org (8.14.2/8.14.2) with ESMTP id n0M3AAfK003175 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 22 Jan 2009 03:10:10 GMT Received: (from geoff@localhost) by hera.kernel.org (8.14.2/8.13.1/Submit) id n0M3A9Se003174; Thu, 22 Jan 2009 03:10:09 GMT Message-Id: <20090122002653.752490070@am.sony.com> References: <20090122002653.146035454@am.sony.com> User-Agent: quilt/0.46-1 Date: Wed, 21 Jan 2009 16:27:01 -0800 From: Geoff Levand To: Jeremy Kerr Content-Disposition: inline; filename=make-client-ops-const.diff X-Virus-Scanned: ClamAV 0.93.3/8886/Wed Jan 21 22:46:06 2009 on hera.kernel.org X-Virus-Status: Clean X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00, UNPARSEABLE_RELAY autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on hera.kernel.org X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0 (hera.kernel.org [127.0.0.1]); Thu, 22 Jan 2009 03:10:11 +0000 (UTC) Cc: cbe-oss-dev@ozlabs.org Subject: [Cbe-oss-dev] [patch 8/9] petitboot: Make client ops constant X-BeenThere: cbe-oss-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Discussion about Open Source Software for the Cell Broadband Engine List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: cbe-oss-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: cbe-oss-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Make the discover_client_ops args read-only. Signed-off-by: Geoff Levand --- ui/common/discover-client.c | 5 +++-- ui/common/discover-client.h | 9 +++++---- ui/test/pb-test.c | 5 +++-- 3 files changed, 11 insertions(+), 8 deletions(-) --- a/ui/common/discover-client.c +++ b/ui/common/discover-client.c @@ -30,7 +30,8 @@ static int discover_client_destructor(vo return 0; } -struct discover_client* discover_client_init(struct discover_client_ops *ops) +struct discover_client* discover_client_init( + const struct discover_client_ops *ops) { struct discover_client *client; struct sockaddr_un addr; @@ -64,7 +65,7 @@ out_err: return NULL; } -int discover_client_get_fd(struct discover_client *client) +int discover_client_get_fd(const struct discover_client *client) { return client->fd; } --- a/ui/common/discover-client.h +++ b/ui/common/discover-client.h @@ -13,14 +13,15 @@ struct discover_client; */ struct discover_client_ops { - int (*add_device)(struct device *device, void *arg); - void (*remove_device)(char *dev_id, void *arg); + int (*add_device)(const struct device *device, void *arg); + void (*remove_device)(const char *dev_id, void *arg); void *cb_arg; }; -struct discover_client *discover_client_init(struct discover_client_ops *ops); +struct discover_client *discover_client_init( + const struct discover_client_ops *ops); -int discover_client_get_fd(struct discover_client *client); +int discover_client_get_fd(const struct discover_client *client); void discover_client_destroy(struct discover_client *client); --- a/ui/test/pb-test.c +++ b/ui/test/pb-test.c @@ -3,7 +3,7 @@ #include "ui/common/discover-client.h" -static int print_device_add(struct device *device, +static int print_device_add(const struct device *device, void __attribute__((unused)) *arg) { struct boot_option *opt; @@ -28,7 +28,8 @@ static int print_device_add(struct devic return 0; } -static void print_device_remove(char *dev_id, void __attribute__((unused)) *arg) +static void print_device_remove(const char *dev_id, + void __attribute__((unused)) *arg) { printf("removed device:\n"); printf("\tid: %s\n", dev_id);