null+****@clear*****
null+****@clear*****
2012年 6月 15日 (金) 13:47:10 JST
Ryo Onodera 2012-06-15 13:47:10 +0900 (Fri, 15 Jun 2012)
New Revision: a15d870bc724b1b2f1fe5d983da3d95b4a99af06
Merged 7bc70fc: Merge pull request #14 from ryoqun/grn-output-envelope
Log:
Rename grn_print_return_code to grn_output_envelope
Modified files:
include/groonga.h
lib/output.c
src/groonga.c
Modified: include/groonga.h (+3 -3)
===================================================================
--- include/groonga.h 2012-06-15 13:44:35 +0900 (9ee1488)
+++ include/groonga.h 2012-06-15 13:47:10 +0900 (f9b3223)
@@ -2143,9 +2143,9 @@ struct _grn_obj_format {
GRN_API void grn_output_obj(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type,
grn_obj *obj, grn_obj_format *format);
-GRN_API void grn_print_return_code(grn_ctx *ctx, grn_rc rc,
- grn_obj *head, grn_obj *body, grn_obj *foot,
- const char *file, int line);
+GRN_API void grn_output_envelope(grn_ctx *ctx, grn_rc rc,
+ grn_obj *head, grn_obj *body, grn_obj *foot,
+ const char *file, int line);
/* obsolete */
GRN_API grn_rc grn_text_otoj(grn_ctx *ctx, grn_obj *bulk, grn_obj *obj,
Modified: lib/output.c (+7 -7)
===================================================================
--- lib/output.c 2012-06-15 13:44:35 +0900 (abc6973)
+++ lib/output.c 2012-06-15 13:47:10 +0900 (d6939a7)
@@ -1298,13 +1298,13 @@ msgpack_buffer_writer(void* data, const char* buf, unsigned int len)
#endif
void
-grn_print_return_code(grn_ctx *ctx,
- grn_rc rc,
- grn_obj *head,
- grn_obj *body,
- grn_obj *foot,
- const char *file,
- int line)
+grn_output_envelope(grn_ctx *ctx,
+ grn_rc rc,
+ grn_obj *head,
+ grn_obj *body,
+ grn_obj *foot,
+ const char *file,
+ int line)
{
double started, finished, elapsed;
Modified: src/groonga.c (+7 -7)
===================================================================
--- src/groonga.c 2012-06-15 13:44:35 +0900 (f2550b6)
+++ src/groonga.c 2012-06-15 13:47:10 +0900 (b9c009d)
@@ -246,9 +246,9 @@ typedef enum {
} grn_http_request_type;
static void
-print_return_code(grn_ctx *ctx, grn_rc rc, grn_obj *head, grn_obj *body, grn_obj *foot)
+output_envelope(grn_ctx *ctx, grn_rc rc, grn_obj *head, grn_obj *body, grn_obj *foot)
{
- grn_print_return_code(ctx, rc, head, body, foot, input_path, number_of_lines);
+ grn_output_envelope(ctx, rc, head, body, foot, input_path, number_of_lines);
}
static void
@@ -262,7 +262,7 @@ s_output(grn_ctx *ctx, int flags, void *arg)
grn_obj head, foot;
GRN_TEXT_INIT(&head, 0);
GRN_TEXT_INIT(&foot, 0);
- print_return_code(ctx, ctx->rc, &head, buf, &foot);
+ output_envelope(ctx, ctx->rc, &head, buf, &foot);
fwrite(GRN_TEXT_VALUE(&head), 1, GRN_TEXT_LEN(&head), stream);
fwrite(GRN_TEXT_VALUE(buf), 1, GRN_TEXT_LEN(buf), stream);
fwrite(GRN_TEXT_VALUE(&foot), 1, GRN_TEXT_LEN(&foot), stream);
@@ -336,7 +336,7 @@ c_output(grn_ctx *ctx)
GRN_TEXT_INIT(&body, GRN_OBJ_DO_SHALLOW_COPY);
GRN_TEXT_INIT(&foot, 0);
GRN_TEXT_SET(ctx, &body, str, str_len);
- print_return_code(ctx, ctx->rc, &head, &body, &foot);
+ output_envelope(ctx, ctx->rc, &head, &body, &foot);
fwrite(GRN_TEXT_VALUE(&head), 1, GRN_TEXT_LEN(&head), output);
fwrite(GRN_TEXT_VALUE(&body), 1, GRN_TEXT_LEN(&body), output);
fwrite(GRN_TEXT_VALUE(&foot), 1, GRN_TEXT_LEN(&foot), output);
@@ -565,10 +565,10 @@ h_output(grn_ctx *ctx, int flags, void *arg)
if (jsonp_func && GRN_TEXT_LEN(jsonp_func)) {
GRN_TEXT_PUT(ctx, &head, GRN_TEXT_VALUE(jsonp_func), GRN_TEXT_LEN(jsonp_func));
GRN_TEXT_PUTC(ctx, &head, '(');
- print_return_code(ctx, expr_rc, &head, outbuf, &foot);
+ output_envelope(ctx, expr_rc, &head, outbuf, &foot);
GRN_TEXT_PUTS(ctx, &foot, ");");
} else {
- print_return_code(ctx, expr_rc, &head, outbuf, &foot);
+ output_envelope(ctx, expr_rc, &head, outbuf, &foot);
}
GRN_TEXT_SETS(ctx, body, "HTTP/1.1 200 OK\r\n");
GRN_TEXT_PUTS(ctx, body, "Connection: close\r\n");
@@ -580,7 +580,7 @@ h_output(grn_ctx *ctx, int flags, void *arg)
GRN_TEXT_PUTS(ctx, body, "\r\n\r\n");
} else {
GRN_BULK_REWIND(outbuf);
- print_return_code(ctx, expr_rc, &head, outbuf, &foot);
+ output_envelope(ctx, expr_rc, &head, outbuf, &foot);
if (expr_rc == GRN_NO_SUCH_FILE_OR_DIRECTORY) {
GRN_TEXT_SETS(ctx, body, "HTTP/1.1 404 Not Found\r\n");
} else {