From: MORIOKA Tomohiko Date: Sun, 21 Apr 2013 02:11:45 +0000 (+0900) Subject: (concord_decode_object): Delete printf to debug. X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2efb5cda5e96ddc7a2dd2c4e01760b2a81cdba70;p=chise%2Fconcord.git (concord_decode_object): Delete printf to debug. (concord_object_get_feature_value): Likewise. --- diff --git a/cos.c b/cos.c index 7e5a51d..878b8c9 100644 --- a/cos.c +++ b/cos.c @@ -503,67 +503,47 @@ concord_decode_object (COS_object ds, COS_object genre, char* id_str; char buf[256]; CONCORD_String_Tank obj_st; - COS_String obj_string; int cid; size_t end; if (index == NULL) return NULL; - printf ("decoding id (%lX)...", id); if (COS_OBJECT_INT_P (id)) { - printf ("(id is an int)..."); snprintf(buf, 256, "%ld", cos_int_value (id)); id_str = buf; } else if (COS_OBJECT_CHAR_P (id)) { - printf ("(id is a char)..."); - snprintf(buf, 256, "%ld", cos_char_id (id)); + snprintf(buf, 256, "%d", cos_char_id (id)); id_str = buf; } else if (COS_OBJECT_SYMBOL_P (id)) { - printf ("(id is a symbol)...."); id_str = cos_string_data (cos_symbol_name ((COS_Symbol)id)); } else if (COS_OBJECT_C_STRING_P (id)) { - printf ("(id is a C-string)...."); id_str = (char*)id; } else if (COS_OBJECT_STRING_P (id)) { - printf ("(id is a string)...."); id_str = cos_string_data ((COS_String)id); } else return NULL; - printf ("done (%s).\n", id_str); if ( concord_index_strid_get_obj_string (index, id_str, &obj_st) ) return NULL; - obj_string = cos_make_string ((char*)CONCORD_String_data (&obj_st), - CONCORD_String_size (&obj_st)); - cid = cos_read_char (CONCORD_String_data (&obj_st), CONCORD_String_size (&obj_st), 0, &end); if ( cid >= 0 ) { - printf ("obj = %s (%d, U+%04X), len = %d, end = %d\n", - cos_string_data (obj_string), - cid, cid, - CONCORD_String_size (&obj_st), end); - cos_release_object (obj_string); return cos_make_char (cid); } - else - printf ("obj = %s\n", cos_string_data (obj_string)); - - cos_release_object (obj_string); return NULL; } @@ -574,13 +554,11 @@ concord_object_get_feature_value (COS_object object, COS_object feature) char id_buf[256]; CONCORD_Feature fobj; CONCORD_String_Tank val_st; - COS_String val_string; size_t end; if (COS_OBJECT_CHAR_P (object)) { - cos_utf8_print_char (object, id_buf, 256); - printf ("Object[char:0x%lX]'s id is %s.\n", object, id_buf); + cos_utf8_print_char (object, (unsigned char*)id_buf, 256); } else return NULL; @@ -593,13 +571,6 @@ concord_object_get_feature_value (COS_object object, COS_object feature) if ( concord_obj_get_feature_value_string (id_buf, fobj, &val_st) ) return NULL; - val_string = cos_make_string ((char*)CONCORD_String_data (&val_st), - CONCORD_String_size (&val_st)); - printf ("obj[%s]'s %s = %s\n", - id_buf, - concord_feature_get_name (fobj), - cos_string_data (val_string)); - return cos_read_object (CONCORD_String_data (&val_st), CONCORD_String_size (&val_st), 0, &end);