null+****@clear*****
null+****@clear*****
2012年 2月 14日 (火) 15:15:56 JST
Kouhei Sutou 2012-02-14 15:15:56 +0900 (Tue, 14 Feb 2012)
New Revision: 08d517eca6b263c4851d98d54e7ce9b1ebebb186
Log:
change newline: CRLF -> LF.
Modified files:
mrn_sys.c
Modified: mrn_sys.c (+153 -153)
===================================================================
--- mrn_sys.c 2012-02-14 15:14:26 +0900 (db6549f)
+++ mrn_sys.c 2012-02-14 15:15:56 +0900 (fa81620)
@@ -1,153 +1,153 @@
-/* -*- c-basic-offset: 2 -*- */
-/*
- Copyright(C) 2010 Tetsuro IKEDA
- Copyright(C) 2011-2012 Kentoku SHIBA
- Copyright(C) 2011 Kouhei Sutou <kou****@clear*****>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include "mrn_sys.h"
-
-int mrn_hash_put(grn_ctx *ctx, grn_hash *hash, const char *key, grn_obj *value)
-{
- int added, res=0;
- void *buf;
- grn_hash_add(ctx, hash, (const char *)key, strlen(key), &buf, &added);
- // duplicate check
- if (added == 0) {
- GRN_LOG(ctx, GRN_LOG_WARNING, "hash put duplicated (key=%s)", key);
- res = -1;
- } else {
- // store address of value
- memcpy(buf, &value, sizeof(grn_obj *));
- GRN_LOG(ctx, GRN_LOG_DEBUG, "hash put (key=%s)", key);
- }
- return res;
-}
-
-int mrn_hash_get(grn_ctx *ctx, grn_hash *hash, const char *key, grn_obj **value)
-{
- int res = 0;
- grn_id id;
- void *buf;
- id = grn_hash_get(ctx, hash, (const char *)key, strlen(key), &buf);
- // key not found
- if (id == GRN_ID_NIL) {
- GRN_LOG(ctx, GRN_LOG_DEBUG, "hash get not found (key=%s)", key);
- res = -1;
- } else {
- // restore address of value
- memcpy(value, buf, sizeof(grn_obj *));
- }
- return res;
-}
-
-int mrn_hash_remove(grn_ctx *ctx, grn_hash *hash, const char *key)
-{
- int res = 0;
- grn_rc rc;
- grn_id id;
- id = grn_hash_get(ctx, hash, (const char*) key, strlen(key), NULL);
- if (id == GRN_ID_NIL) {
- GRN_LOG(ctx, GRN_LOG_WARNING, "hash remove not found (key=%s)", key);
- res = -1;
- } else {
- rc = grn_hash_delete_by_id(ctx, hash, id, NULL);
- if (rc != GRN_SUCCESS) {
- GRN_LOG(ctx, GRN_LOG_ERROR, "hash remove error (key=%s)", key);
- res = -1;
- } else {
- GRN_LOG(ctx, GRN_LOG_DEBUG, "hash remove (key=%s)", key);
- }
- }
- return res;
-}
-
-/**
- * "./${db}/${table}" ==> "${db}.mrn"
- * "./${db}/" ==> "${db}.mrn"
- * "/tmp/mysql-test/var/tmp/mysqld.1/#sql27c5_1_0" ==>
- * "/tmp/mysql-test/var/tmp/mysqld.1/#sql27c5_1_0.mrn"
- */
-char *mrn_db_path_gen(const char *arg, char *dest)
-{
- if (strncmp(arg, "./", 2) == 0) {
- int i = 2, j = 0, len;
- len = strlen(arg);
- while (arg[i] != '/' && i < len) {
- dest[j++] = arg[i++];
- }
- dest[j] = '\0';
- } else {
- strcpy(dest, arg);
- }
- strcat(dest, MRN_DB_FILE_SUFFIX);
- return dest;
-}
-
-/**
- * "./${db}/${table}" ==> "${db}"
- * "./${db}/" ==> "${db}"
- * "/tmp/mysql-test/var/tmp/mysqld.1/#sql27c5_1_0" ==>
- * "/tmp/mysql-test/var/tmp/mysqld.1/#sql27c5_1_0"
- */
-char *mrn_db_name_gen(const char *arg, char *dest)
-{
- if (strncmp(arg, "./", 2) == 0) {
- int i = 2, j = 0, len;
- len = strlen(arg);
- while (arg[i] != '/' && i < len) {
- dest[j++] = arg[i++];
- }
- dest[j] = '\0';
- } else {
- strcpy(dest, arg);
- }
- return dest;
-}
-
-/**
- * "./${db}/${table}" ==> "${table}"
- */
-char *mrn_table_name_gen(const char *arg, char *dest)
-{
- int len = strlen(arg);
- int i=len, j=0;
- for (; arg[--i] != '/' ;) {}
- for (; i <= len ;) {
- dest[j++] = arg[++i];
- }
- dest[j] = '\0';
- return dest;
-}
-
-/**
- * "${table}" ==> "${table}_${index_name}"
- */
-char *mrn_index_table_name_gen(const char *table_name,
- const char *index_name,
- char *dest)
-{
- snprintf(dest, MRN_MAX_PATH_SIZE, "%s_%s", table_name, index_name);
- return dest;
-}
+/* -*- c-basic-offset: 2 -*- */
+/*
+ Copyright(C) 2010 Tetsuro IKEDA
+ Copyright(C) 2011-2012 Kentoku SHIBA
+ Copyright(C) 2011 Kouhei Sutou <kou****@clear*****>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "mrn_sys.h"
+
+int mrn_hash_put(grn_ctx *ctx, grn_hash *hash, const char *key, grn_obj *value)
+{
+ int added, res=0;
+ void *buf;
+ grn_hash_add(ctx, hash, (const char *)key, strlen(key), &buf, &added);
+ // duplicate check
+ if (added == 0) {
+ GRN_LOG(ctx, GRN_LOG_WARNING, "hash put duplicated (key=%s)", key);
+ res = -1;
+ } else {
+ // store address of value
+ memcpy(buf, &value, sizeof(grn_obj *));
+ GRN_LOG(ctx, GRN_LOG_DEBUG, "hash put (key=%s)", key);
+ }
+ return res;
+}
+
+int mrn_hash_get(grn_ctx *ctx, grn_hash *hash, const char *key, grn_obj **value)
+{
+ int res = 0;
+ grn_id id;
+ void *buf;
+ id = grn_hash_get(ctx, hash, (const char *)key, strlen(key), &buf);
+ // key not found
+ if (id == GRN_ID_NIL) {
+ GRN_LOG(ctx, GRN_LOG_DEBUG, "hash get not found (key=%s)", key);
+ res = -1;
+ } else {
+ // restore address of value
+ memcpy(value, buf, sizeof(grn_obj *));
+ }
+ return res;
+}
+
+int mrn_hash_remove(grn_ctx *ctx, grn_hash *hash, const char *key)
+{
+ int res = 0;
+ grn_rc rc;
+ grn_id id;
+ id = grn_hash_get(ctx, hash, (const char*) key, strlen(key), NULL);
+ if (id == GRN_ID_NIL) {
+ GRN_LOG(ctx, GRN_LOG_WARNING, "hash remove not found (key=%s)", key);
+ res = -1;
+ } else {
+ rc = grn_hash_delete_by_id(ctx, hash, id, NULL);
+ if (rc != GRN_SUCCESS) {
+ GRN_LOG(ctx, GRN_LOG_ERROR, "hash remove error (key=%s)", key);
+ res = -1;
+ } else {
+ GRN_LOG(ctx, GRN_LOG_DEBUG, "hash remove (key=%s)", key);
+ }
+ }
+ return res;
+}
+
+/**
+ * "./${db}/${table}" ==> "${db}.mrn"
+ * "./${db}/" ==> "${db}.mrn"
+ * "/tmp/mysql-test/var/tmp/mysqld.1/#sql27c5_1_0" ==>
+ * "/tmp/mysql-test/var/tmp/mysqld.1/#sql27c5_1_0.mrn"
+ */
+char *mrn_db_path_gen(const char *arg, char *dest)
+{
+ if (strncmp(arg, "./", 2) == 0) {
+ int i = 2, j = 0, len;
+ len = strlen(arg);
+ while (arg[i] != '/' && i < len) {
+ dest[j++] = arg[i++];
+ }
+ dest[j] = '\0';
+ } else {
+ strcpy(dest, arg);
+ }
+ strcat(dest, MRN_DB_FILE_SUFFIX);
+ return dest;
+}
+
+/**
+ * "./${db}/${table}" ==> "${db}"
+ * "./${db}/" ==> "${db}"
+ * "/tmp/mysql-test/var/tmp/mysqld.1/#sql27c5_1_0" ==>
+ * "/tmp/mysql-test/var/tmp/mysqld.1/#sql27c5_1_0"
+ */
+char *mrn_db_name_gen(const char *arg, char *dest)
+{
+ if (strncmp(arg, "./", 2) == 0) {
+ int i = 2, j = 0, len;
+ len = strlen(arg);
+ while (arg[i] != '/' && i < len) {
+ dest[j++] = arg[i++];
+ }
+ dest[j] = '\0';
+ } else {
+ strcpy(dest, arg);
+ }
+ return dest;
+}
+
+/**
+ * "./${db}/${table}" ==> "${table}"
+ */
+char *mrn_table_name_gen(const char *arg, char *dest)
+{
+ int len = strlen(arg);
+ int i=len, j=0;
+ for (; arg[--i] != '/' ;) {}
+ for (; i <= len ;) {
+ dest[j++] = arg[++i];
+ }
+ dest[j] = '\0';
+ return dest;
+}
+
+/**
+ * "${table}" ==> "${table}_${index_name}"
+ */
+char *mrn_index_table_name_gen(const char *table_name,
+ const char *index_name,
+ char *dest)
+{
+ snprintf(dest, MRN_MAX_PATH_SIZE, "%s_%s", table_name, index_name);
+ return dest;
+}