From owner-svn-soc-all@FreeBSD.ORG Wed Aug 6 01:14:51 2014 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 33604598 for ; Wed, 6 Aug 2014 01:14:51 +0000 (UTC) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0629923E8 for ; Wed, 6 Aug 2014 01:14:51 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id s761EoV4074454 for ; Wed, 6 Aug 2014 01:14:50 GMT (envelope-from ghostmansd@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s761EoLV074452 for svn-soc-all@FreeBSD.org; Wed, 6 Aug 2014 01:14:50 GMT (envelope-from ghostmansd@FreeBSD.org) Date: Wed, 6 Aug 2014 01:14:50 GMT Message-Id: <201408060114.s761EoLV074452@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to ghostmansd@FreeBSD.org using -f From: ghostmansd@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r271973 - soc2014/ghostmansd/head/lib/libcolldb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Aug 2014 01:14:51 -0000 Author: ghostmansd Date: Wed Aug 6 01:14:50 2014 New Revision: 271973 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271973 Log: naming issues for colldb.c source file Modified: soc2014/ghostmansd/head/lib/libcolldb/colldb.c Modified: soc2014/ghostmansd/head/lib/libcolldb/colldb.c ============================================================================== --- soc2014/ghostmansd/head/lib/libcolldb/colldb.c Wed Aug 6 01:01:08 2014 (r271972) +++ soc2014/ghostmansd/head/lib/libcolldb/colldb.c Wed Aug 6 01:14:50 2014 (r271973) @@ -30,8 +30,8 @@ #include "colldb.h" -struct __collation * -__collation_create(const char *path, int mode) +struct collation * +collation_create(const char *path, int mode) { DBT key; DBT value; @@ -39,7 +39,7 @@ int error = 0; uint32_t version = 0; int flags = (O_RDWR | O_CREAT | O_TRUNC); - struct __collation *collation = NULL; + struct collation *collation = NULL; collation = calloc(1, sizeof(*collation)); if (collation == NULL) @@ -89,8 +89,8 @@ } -struct __collation * -__collation_open(const char *path) +struct collation * +collation_open(const char *path) { DBT key; DBT value; @@ -98,7 +98,7 @@ int error = 0; int state = 0; int flags = O_RDONLY; - struct __collation *collation = NULL; + struct collation *collation = NULL; collation = calloc(1, sizeof(*collation)); if (collation == NULL) @@ -157,7 +157,7 @@ int -__collation_close(struct __collation *collation) +collation_close(struct collation *collation) { DB *db = NULL; int error = 0; @@ -186,7 +186,7 @@ int -__collation_sync(struct __collation *collation) +collation_sync(struct collation *collation) { DB *db = NULL; @@ -206,9 +206,9 @@ int -__collation_get(struct __collation *collation, - struct __collation_key *key, - struct __collation_value *value) +collation_get(struct collation *collation, + struct collation_key *key, + struct collation_value *value) { DBT dbkey; DBT dbvalue; @@ -216,7 +216,7 @@ size_t i = 0; int state = 0; uint32_t *keybuf = NULL; - struct __collation_weight *weights = NULL; + struct collation_weight *weights = NULL; if ((collation == NULL) || (key == NULL) || (value == NULL)) { @@ -273,9 +273,9 @@ int -__collation_put(struct __collation *collation, - struct __collation_key *key, - struct __collation_value *value) +collation_put(struct collation *collation, + struct collation_key *key, + struct collation_value *value) { DBT dbkey; DBT dbvalue; @@ -284,7 +284,7 @@ int state = 0; int error = 0; uint32_t *keybuf = NULL; - struct __collation_weight *valuebuf = NULL; + struct collation_weight *valuebuf = NULL; if ((collation == NULL) || (key == NULL) || (value == NULL)) {