socsvn commit: r271973 - soc2014/ghostmansd/head/lib/libcolldb

[ghostmansd at FreeBSD.org]

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))
 	{