diff options
-rw-r--r-- | src/nxt_unit_app_test.c | 52 |
1 files changed, 21 insertions, 31 deletions
diff --git a/src/nxt_unit_app_test.c b/src/nxt_unit_app_test.c index d719880..d4fea18 100644 --- a/src/nxt_unit_app_test.c +++ b/src/nxt_unit_app_test.c @@ -41,7 +41,6 @@ static int ready_handler(nxt_unit_ctx_t *ctx); static void *worker(void *main_ctx); static void greeting_app_request_handler(nxt_unit_request_info_t *req); -static inline char *copy(char *p, const void *src, uint32_t len); static int thread_count; @@ -217,52 +216,52 @@ greeting_app_request_handler(nxt_unit_request_info_t *req) p = buf->free; - p = copy(p, REQUEST_DATA, nxt_length(REQUEST_DATA)); + p = mempcpy(p, REQUEST_DATA, nxt_length(REQUEST_DATA)); - p = copy(p, METHOD, nxt_length(METHOD)); - p = copy(p, nxt_unit_sptr_get(&r->method), r->method_length); + p = mempcpy(p, METHOD, nxt_length(METHOD)); + p = mempcpy(p, nxt_unit_sptr_get(&r->method), r->method_length); *p++ = '\n'; - p = copy(p, PROTOCOL, nxt_length(PROTOCOL)); - p = copy(p, nxt_unit_sptr_get(&r->version), r->version_length); + p = mempcpy(p, PROTOCOL, nxt_length(PROTOCOL)); + p = mempcpy(p, nxt_unit_sptr_get(&r->version), r->version_length); *p++ = '\n'; - p = copy(p, REMOTE_ADDR, nxt_length(REMOTE_ADDR)); - p = copy(p, nxt_unit_sptr_get(&r->remote), r->remote_length); + p = mempcpy(p, REMOTE_ADDR, nxt_length(REMOTE_ADDR)); + p = mempcpy(p, nxt_unit_sptr_get(&r->remote), r->remote_length); *p++ = '\n'; - p = copy(p, LOCAL_ADDR, nxt_length(LOCAL_ADDR)); - p = copy(p, nxt_unit_sptr_get(&r->local_addr), r->local_addr_length); + p = mempcpy(p, LOCAL_ADDR, nxt_length(LOCAL_ADDR)); + p = mempcpy(p, nxt_unit_sptr_get(&r->local_addr), r->local_addr_length); *p++ = '\n'; - p = copy(p, TARGET, nxt_length(TARGET)); - p = copy(p, nxt_unit_sptr_get(&r->target), r->target_length); + p = mempcpy(p, TARGET, nxt_length(TARGET)); + p = mempcpy(p, nxt_unit_sptr_get(&r->target), r->target_length); *p++ = '\n'; - p = copy(p, PATH, nxt_length(PATH)); - p = copy(p, nxt_unit_sptr_get(&r->path), r->path_length); + p = mempcpy(p, PATH, nxt_length(PATH)); + p = mempcpy(p, nxt_unit_sptr_get(&r->path), r->path_length); *p++ = '\n'; if (r->query.offset) { - p = copy(p, QUERY, nxt_length(QUERY)); - p = copy(p, nxt_unit_sptr_get(&r->query), r->query_length); + p = mempcpy(p, QUERY, nxt_length(QUERY)); + p = mempcpy(p, nxt_unit_sptr_get(&r->query), r->query_length); *p++ = '\n'; } - p = copy(p, FIELDS, nxt_length(FIELDS)); + p = mempcpy(p, FIELDS, nxt_length(FIELDS)); for (i = 0; i < r->fields_count; i++) { f = r->fields + i; - p = copy(p, FIELD_PAD, nxt_length(FIELD_PAD)); - p = copy(p, nxt_unit_sptr_get(&f->name), f->name_length); - p = copy(p, FIELD_SEP, nxt_length(FIELD_SEP)); - p = copy(p, nxt_unit_sptr_get(&f->value), f->value_length); + p = mempcpy(p, FIELD_PAD, nxt_length(FIELD_PAD)); + p = mempcpy(p, nxt_unit_sptr_get(&f->name), f->name_length); + p = mempcpy(p, FIELD_SEP, nxt_length(FIELD_SEP)); + p = mempcpy(p, nxt_unit_sptr_get(&f->value), f->value_length); *p++ = '\n'; } if (r->content_length > 0) { - p = copy(p, BODY, nxt_length(BODY)); + p = mempcpy(p, BODY, nxt_length(BODY)); res = nxt_unit_request_read(req, buf->free, buf->end - buf->free); buf->free += res; @@ -314,12 +313,3 @@ fail: nxt_unit_request_done(req, rc); } - - -static inline char * -copy(char *p, const void *src, uint32_t len) -{ - memcpy(p, src, len); - - return p + len; -} |