X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fconcord.git;a=blobdiff_plain;f=concord.c;h=71d5d4dca68173e60985bb8ce3d2dcfa56e9618b;hp=2bac1df92daaf7fd6fc17d91c82c16c831faf96b;hb=a778618ff4a07715a71d3e493a8fff9696b5a105;hpb=38761a1b5ddbdc3ecf9a05e7f46f3dd9fae4ba4f

diff --git a/concord.c b/concord.c
index 2bac1df..71d5d4d 100644
--- a/concord.c
+++ b/concord.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003,2004,2005,2006,2011 MORIOKA Tomohiko
+/* Copyright (C) 2003, 2004, 2005, 2006, 2011, 2013 MORIOKA Tomohiko
    This file is part of the CONCORD Library.
 
    The CONCORD Library is free software; you can redistribute it and/or
@@ -21,11 +21,9 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <dirent.h>
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
 #include "sysdep.h"
 #include "concord.h"
+#include "cos-i.h"
 #include "concord-name.h"
 #include "concord-bdb.h"
 
@@ -44,14 +42,10 @@ CONCORD_String_data (const CONCORD_String s)
 
 CONCORD_Genre concord_ds_open_genre (CONCORD_DS ds, const char* name);
 
-int concord_close_genre (CONCORD_Genre genre);
-
 
 CONCORD_Feature
 concord_genre_open_feature (CONCORD_Genre genre, const char* name);
 
-int concord_close_feature (CONCORD_Feature feature);
-
 
 CONCORD_INDEX
 concord_genre_open_index (CONCORD_Genre genre, const char* index);
@@ -59,32 +53,14 @@ concord_genre_open_index (CONCORD_Genre genre, const char* index);
 CONCORD_Feature
 concord_genre_get_feature_0 (CONCORD_Genre genre, const char* name);
 
-int concord_close_index (CONCORD_INDEX table);
-
 
 CONCORD_Object
 concord_default_read_object (const unsigned char* string, size_t length);
 
 
-typedef struct CONCORD_Object_Header
-{
-  unsigned char prefix;
-  unsigned char type;
-} CONCORD_Object_Header;
-
-#define CONCORD_OBJECT_TYPE_NULL	  0
-#define CONCORD_OBJECT_TYPE_C_STRING	  1
-#define CONCORD_OBJECT_TYPE_INT		  2
-#define CONCORD_OBJECT_TYPE_DS		 16
-#define CONCORD_OBJECT_TYPE_GENRE	 17
-#define CONCORD_OBJECT_TYPE_FEATURE	 18
-#define CONCORD_OBJECT_TYPE_INDEX	 19
-#define CONCORD_OBJECT_TYPE_OBJECT	128
-
-
-struct CONCORD_DS_Table
+struct COS_DS_ent
 {
-  CONCORD_Object_Header header;
+  COS_Object_Header header;
   CONCORD_Backend_Type type;
   char *location;
   CONCORD_NAME_TABLE* genre_names;
@@ -104,21 +80,19 @@ concord_default_read_object (const unsigned char* str, size_t length)
     return NULL;
   strncpy ((char*)buf, (char*)str, length);
   buf[length] = '\0';
-  return buf;
+  return (CONCORD_Object)buf;
 }
 
 CONCORD_DS
 concord_open_ds (CONCORD_Backend_Type type, const char* location,
 		 int subtype, int modemask)
 {
-  CONCORD_DS ds = (CONCORD_DS)malloc (sizeof (CONCORD_DS_Table));
+  CONCORD_DS ds = COS_ALLOCATE_OBJECT (DS);
   size_t len = strlen (location);
 
   if (ds == NULL)
     return NULL;
 
-  ds->header.prefix = 0xff;
-  ds->header.type = CONCORD_OBJECT_TYPE_DS;
   ds->type = type;
   ds->subtype = ( (subtype != 0) ? subtype : DB_HASH );
   ds->modemask = modemask;
@@ -288,9 +262,9 @@ concord_ds_foreach_genre_name (CONCORD_DS ds,
 }
 
 
-struct CONCORD_Genre_Table
+struct COS_Genre_ent
 {
-  CONCORD_Object_Header header;
+  COS_Object_Header header;
   CONCORD_DS ds;
   char *name;
   CONCORD_NAME_TABLE* feature_names;
@@ -306,12 +280,10 @@ concord_ds_open_genre (CONCORD_DS ds, const char* name)
   if (ds == NULL)
     return NULL;
 
-  genre = (CONCORD_Genre)malloc (sizeof (CONCORD_Genre_Table));
+  genre = COS_ALLOCATE_OBJECT (Genre);
   if (genre == NULL)
     return NULL;
 
-  genre->header.prefix = 0xff;
-  genre->header.type = CONCORD_OBJECT_TYPE_GENRE;
   genre->ds = ds;
   genre->name = (char*)malloc (len + 1);
   if (genre->name == NULL)
@@ -549,9 +521,9 @@ concord_genre_get_index (CONCORD_Genre genre, const char* name)
 }
 
 
-struct CONCORD_Feature_Table
+struct COS_Feature_ent
 {
-  CONCORD_Object_Header header;
+  COS_Object_Header header;
   CONCORD_Genre genre;
   char* name;
   DB* db;
@@ -567,12 +539,10 @@ concord_genre_open_feature (CONCORD_Genre genre, const char* feature)
   if (genre == NULL)
     return NULL;
 
-  table = (CONCORD_Feature)malloc (sizeof (CONCORD_Feature_Table));
+  table = COS_ALLOCATE_OBJECT (Feature);
   if (table == NULL)
     return NULL;
 
-  table->header.prefix = 0xff;
-  table->header.type = CONCORD_OBJECT_TYPE_FEATURE;
   table->genre = genre;
   table->db = NULL;
   table->access = 0;
@@ -766,9 +736,9 @@ concord_feature_foreach_obj_string (CONCORD_Feature feature,
 }
 
 
-struct CONCORD_INDEX_Table
+struct COS_Feature_INDEX_ent
 {
-  CONCORD_Object_Header header;
+  COS_Object_Header header;
   CONCORD_Genre genre;
   char *name;
   DB* db;
@@ -784,12 +754,10 @@ concord_genre_open_index (CONCORD_Genre genre, const char* index)
   if (genre == NULL)
     return NULL;
 
-  table = (CONCORD_INDEX)malloc (sizeof (CONCORD_INDEX_Table));
+  table = COS_ALLOCATE_OBJECT (Feature_INDEX);
   if (table == NULL)
     return NULL;
 
-  table->header.prefix = 0xff;
-  table->header.type = CONCORD_OBJECT_TYPE_INDEX;
   table->genre = genre;
   table->db = NULL;
   table->access = 0;
@@ -827,6 +795,18 @@ concord_close_index (CONCORD_INDEX table)
   return status;
 }
 
+char*
+concord_index_get_name (CONCORD_INDEX index)
+{
+  return index->name;
+}
+
+CONCORD_Genre
+concord_index_get_genre (CONCORD_INDEX index)
+{
+  return index->genre;
+}
+
 int
 concord_index_setup_db (CONCORD_INDEX index, int writable)
 {