Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C35629008 for ; Sat, 26 Nov 2011 23:37:53 +0000 (UTC) Received: (qmail 40504 invoked by uid 500); 26 Nov 2011 23:37:53 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 40475 invoked by uid 500); 26 Nov 2011 23:37:53 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 40468 invoked by uid 99); 26 Nov 2011 23:37:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Nov 2011 23:37:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Nov 2011 23:37:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0C403553E8; Sat, 26 Nov 2011 23:37:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: randall@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: fix warnings in couch_icu_driver.c Message-Id: <20111126233730.0C403553E8@tyr.zones.apache.org> Date: Sat, 26 Nov 2011 23:37:30 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Updated Branches: refs/heads/master 3bc6cc5ce -> c4f6ff9c6 fix warnings in couch_icu_driver.c Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c4f6ff9c Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c4f6ff9c Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c4f6ff9c Branch: refs/heads/master Commit: c4f6ff9c6cf5512546d5799f05dd445a4da979b3 Parents: 3bc6cc5 Author: Randall Leeds Authored: Sat Nov 26 15:32:44 2011 -0800 Committer: Randall Leeds Committed: Sat Nov 26 15:32:44 2011 -0800 ---------------------------------------------------------------------- src/couchdb/priv/icu_driver/couch_icu_driver.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/c4f6ff9c/src/couchdb/priv/icu_driver/couch_icu_driver.c ---------------------------------------------------------------------- diff --git a/src/couchdb/priv/icu_driver/couch_icu_driver.c b/src/couchdb/priv/icu_driver/couch_icu_driver.c index edfd84a..c627fca 100644 --- a/src/couchdb/priv/icu_driver/couch_icu_driver.c +++ b/src/couchdb/priv/icu_driver/couch_icu_driver.c @@ -30,6 +30,10 @@ specific language governing permissions and limitations under the License. #include /* for memcpy */ #endif +#define DRIVER_NAME "couch_icu_driver" + +DRIVER_INIT(DRIVER_NAME); /* prototype for erl_driver entry point */ + typedef struct { ErlDrvPort port; UCollator* collNoCase; @@ -155,7 +159,7 @@ ErlDrvEntry couch_driver_entry = { NULL, /* F_PTR output, called when erlang has sent */ NULL, /* F_PTR ready_input, called when input descriptor ready */ NULL, /* F_PTR ready_output, called when output descriptor ready */ - "couch_icu_driver", /* char *driver_name, the argument to open_port */ + (char*)DRIVER_NAME, /* char *driver_name, the argument to open_port */ NULL, /* F_PTR finish, called when unloaded */ NULL, /* Not used */ couch_drv_control, /* F_PTR control, port_command callback */ @@ -173,7 +177,7 @@ ErlDrvEntry couch_driver_entry = { NULL, /* F_PTR process_exit */ }; -DRIVER_INIT(couch_icu_driver) /* must match name in driver_entry */ +DRIVER_INIT(DRIVER_NAME) /* must match name in driver_entry */ { return &couch_driver_entry; }