From patchwork Tue May 25 03:58:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Smith, Stan" X-Patchwork-Id: 102077 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4P3wru4030365 for ; Tue, 25 May 2010 03:58:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754415Ab0EYD6v (ORCPT ); Mon, 24 May 2010 23:58:51 -0400 Received: from mga03.intel.com ([143.182.124.21]:50674 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754019Ab0EYD6v (ORCPT ); Mon, 24 May 2010 23:58:51 -0400 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 24 May 2010 20:58:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.53,296,1272870000"; d="scan'208";a="280908680" Received: from unknown (HELO scsmithMOBL1) ([10.254.75.24]) by azsmga001.ch.intel.com with ESMTP; 24 May 2010 20:58:49 -0700 From: "Stan C. Smith" To: "Sasha Khapyorsky" Cc: Subject: [PATCH] opensm - cleanup Date: Mon, 24 May 2010 20:58:48 -0700 Message-ID: <59F66ECB77704137A5F122AE78B5D554@amr.corp.intel.com> MIME-Version: 1.0 X-Mailer: Microsoft Office Outlook 11 Thread-Index: Acr7vmxwSnY+/+JoRoi5yDoXkzC1EQ== X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.5579 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]); Tue, 25 May 2010 03:58:53 +0000 (UTC) --- a/opensm/include/opensm/osm_base.h 2010-05-22 14:26:26.000000000 -0700 +++ b/opensm/include/opensm/osm_base.h 2010-05-11 17:47:37.886597800 -0700 @@ -181,7 +181,7 @@ * SYNOPSIS */ #ifdef __WIN__ -#define OSM_DEFAULT_TMP_DIR GetOsmTempPath() +#define OSM_DEFAULT_TMP_DIR "%TEMP%\\" #else #define OSM_DEFAULT_TMP_DIR "/var/log/" #endif @@ -196,7 +196,7 @@ * SYNOPSIS */ #ifdef __WIN__ -#define OSM_DEFAULT_CACHE_DIR GetOsmCachePath() +#define OSM_DEFAULT_CACHE_DIR "%TEMP%" #else #define OSM_DEFAULT_CACHE_DIR "/var/cache/opensm" #endif @@ -211,7 +211,7 @@ * SYNOPSIS */ #ifdef __WIN__ -#define OSM_DEFAULT_LOG_FILE strcat(GetOsmTempPath(), "osm.log") +#define OSM_DEFAULT_LOG_FILE OSM_DEFAULT_TMP_DIR "osm.log" #else #define OSM_DEFAULT_LOG_FILE "/var/log/opensm.log" #endif @@ -226,15 +226,13 @@ * * SYNOPSIS */ -#ifdef __WIN__ -#define OSM_DEFAULT_CONFIG_FILE strcat(GetOsmCachePath(), "opensm.conf") -#elif defined(HAVE_DEFAULT_OPENSM_CONFIG_FILE) +#if defined(HAVE_DEFAULT_OPENSM_CONFIG_FILE) #define OSM_DEFAULT_CONFIG_FILE HAVE_DEFAULT_OPENSM_CONFIG_FILE #elif defined (OPENSM_CONFIG_DIR) #define OSM_DEFAULT_CONFIG_FILE OPENSM_CONFIG_DIR "/opensm.conf" #else #define OSM_DEFAULT_CONFIG_FILE "/etc/opensm/opensm.conf" -#endif /* __WIN__ */ +#endif /***********/ /****d* OpenSM: Base/OSM_DEFAULT_PARTITION_CONFIG_FILE @@ -246,15 +244,13 @@ * * SYNOPSIS */ -#ifdef __WIN__ -#define OSM_DEFAULT_PARTITION_CONFIG_FILE strcat(GetOsmCachePath(), "osm-partitions.conf") -#elif defined(HAVE_DEFAULT_PARTITION_CONFIG_FILE) +#if defined(HAVE_DEFAULT_PARTITION_CONFIG_FILE) #define OSM_DEFAULT_PARTITION_CONFIG_FILE HAVE_DEFAULT_PARTITION_CONFIG_FILE #elif defined(OPENSM_CONFIG_DIR) #define OSM_DEFAULT_PARTITION_CONFIG_FILE OPENSM_CONFIG_DIR "/partitions.conf" #else #define OSM_DEFAULT_PARTITION_CONFIG_FILE "/etc/opensm/partitions.conf" -#endif /* __WIN__ */ +#endif /***********/ /****d* OpenSM: Base/OSM_DEFAULT_QOS_POLICY_FILE @@ -266,15 +262,13 @@ * * SYNOPSIS */ -#ifdef __WIN__ -#define OSM_DEFAULT_QOS_POLICY_FILE strcat(GetOsmCachePath(), "osm-qos-policy.conf") -#elif defined(HAVE_DEFAULT_QOS_POLICY_FILE) +#if defined(HAVE_DEFAULT_QOS_POLICY_FILE) #define OSM_DEFAULT_QOS_POLICY_FILE HAVE_DEFAULT_QOS_POLICY_FILE #elif defined(OPENSM_CONFIG_DIR) #define OSM_DEFAULT_QOS_POLICY_FILE OPENSM_CONFIG_DIR "/qos-policy.conf" #else #define OSM_DEFAULT_QOS_POLICY_FILE "/etc/opensm/qos-policy.conf" -#endif /* __WIN__ */ +#endif /***********/ /****d* OpenSM: Base/OSM_DEFAULT_PREFIX_ROUTES_FILE @@ -286,9 +280,7 @@ * * SYNOPSIS */ -#ifdef __WIN__ -#define OSM_DEFAULT_PREFIX_ROUTES_FILE strcat(GetOsmCachePath(), "osm-prefix-routes.conf") -#elif defined(HAVE_DEFAULT_PREFIX_ROUTES_FILE) +#if defined(HAVE_DEFAULT_PREFIX_ROUTES_FILE) #define OSM_DEFAULT_PREFIX_ROUTES_FILE HAVE_DEFAULT_PREFIX_ROUTES_FILE #elif defined(OPENSM_CONFIG_DIR) #define OSM_DEFAULT_PREFIX_ROUTES_FILE OPENSM_CONFIG_DIR "/prefix-routes.conf"