From patchwork Thu Jun 24 08:10:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yevgeny Kliteynik X-Patchwork-Id: 107803 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5O8Ag7Z014153 for ; Thu, 24 Jun 2010 08:10:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751585Ab0FXIKl (ORCPT ); Thu, 24 Jun 2010 04:10:41 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:64541 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751102Ab0FXIKk (ORCPT ); Thu, 24 Jun 2010 04:10:40 -0400 Received: by fxm3 with SMTP id 3so133696fxm.19 for ; Thu, 24 Jun 2010 01:10:37 -0700 (PDT) Received: by 10.223.109.195 with SMTP id k3mr694421fap.79.1277367036931; Thu, 24 Jun 2010 01:10:36 -0700 (PDT) Received: from [10.4.1.29] ([62.219.166.71]) by mx.google.com with ESMTPS id 2sm40221525faf.3.2010.06.24.01.10.35 (version=SSLv3 cipher=RC4-MD5); Thu, 24 Jun 2010 01:10:36 -0700 (PDT) Message-ID: <4C2312F0.8020308@dev.mellanox.co.il> Date: Thu, 24 Jun 2010 11:10:24 +0300 From: Yevgeny Kliteynik User-Agent: Thunderbird 1.5.0.5 (X11/20060719) MIME-Version: 1.0 To: Sasha Khapyorsky CC: Linux RDMA , Yevgeny Kliteynik Subject: [PATCH] opensm: event plig-in API fixed to compile with g++ Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 24 Jun 2010 08:10:43 +0000 (UTC) diff --git a/opensm/include/opensm/osm_event_plugin.h b/opensm/include/opensm/osm_event_plugin.h index 0b3464e..aa3fed4 100644 --- a/opensm/include/opensm/osm_event_plugin.h +++ b/opensm/include/opensm/osm_event_plugin.h @@ -145,7 +145,7 @@ typedef struct osm_api_ps_event { typedef struct osm_event_plugin { const char *osm_version; void *(*create) (struct osm_opensm *osm); - void (*delete) (void *plugin_data); + void (*destroy) (void *plugin_data); void (*report) (void *plugin_data, osm_epi_event_id_t event_id, void *event_data); } osm_event_plugin_t; diff --git a/opensm/opensm/osm_event_plugin.c b/opensm/opensm/osm_event_plugin.c index 2d67065..7f61960 100644 --- a/opensm/opensm/osm_event_plugin.c +++ b/opensm/opensm/osm_event_plugin.c @@ -141,8 +141,8 @@ DLOPENFAIL: void osm_epi_destroy(osm_epi_plugin_t * plugin) { if (plugin) { - if (plugin->impl->delete) - plugin->impl->delete(plugin->plugin_data); + if (plugin->impl->destroy) + plugin->impl->destroy(plugin->plugin_data); dlclose(plugin->handle); free(plugin->plugin_name); free(plugin); diff --git a/opensm/osmeventplugin/libosmeventplugin.ver b/opensm/osmeventplugin/libosmeventplugin.ver index f755ff6..0c3a85b 100644 --- a/opensm/osmeventplugin/libosmeventplugin.ver +++ b/opensm/osmeventplugin/libosmeventplugin.ver @@ -6,4 +6,4 @@ # API_REV - advance on any added API # RUNNING_REV - advance any change to the vendor files # AGE - number of backward versions the API still supports -LIBVERSION=1:0:0 +LIBVERSION=2:0:0 diff --git a/opensm/osmeventplugin/src/osmeventplugin.c b/opensm/osmeventplugin/src/osmeventplugin.c index f40f7fe..a82be07 100644 --- a/opensm/osmeventplugin/src/osmeventplugin.c +++ b/opensm/osmeventplugin/src/osmeventplugin.c @@ -207,6 +207,6 @@ static void report(void *_log, osm_epi_event_id_t event_id, void *event_data) osm_event_plugin_t osm_event_plugin = { osm_version:OSM_VERSION, create:construct, - delete:destroy, + destroy:destroy, report:report };