diff options
| author | Sage Weil <sage@inktank.com> | 2012-08-21 19:48:12 +0200 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-08-21 19:48:48 +0200 |
| commit | ddbef4750c9df2eaca4fabc0d0ec06b920fc4fa4 (patch) | |
| tree | d3fc8ee398250d4f9a32f3cb06a31035d84e14af | |
| parent | rgw: dump content_range using 64 bit formatters (diff) | |
| download | ceph-ddbef4750c9df2eaca4fabc0d0ec06b920fc4fa4.tar.xz ceph-ddbef4750c9df2eaca4fabc0d0ec06b920fc4fa4.zip | |
Revert "rgw: dump content_range using 64 bit formatters"
This reverts commit cc435e99802f77b3d4b21abe022665ac9df259cf.
Wrong fix; fcgi doesn't do %lld
| -rw-r--r-- | src/rgw/rgw_rest.cc | 4 | ||||
| -rw-r--r-- | src/rgw/rgw_rest.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc index c2990e3fdb7..2e5e78fefba 100644 --- a/src/rgw/rgw_rest.cc +++ b/src/rgw/rgw_rest.cc @@ -253,9 +253,9 @@ void dump_continue(struct req_state *s) FCGX_FFlush(s->fcgx->out); } -void dump_range(struct req_state *s, uint64_t ofs, uint64_t end, uint64_t total) +void dump_range(struct req_state *s, off_t ofs, off_t end, size_t total) { - CGI_PRINTF(s,"Content-Range: bytes %lld-%lld/%lld\n", (long long)ofs, (long long)end, (long long)total); + CGI_PRINTF(s,"Content-Range: bytes %d-%d/%d\n", (int)ofs, (int)end, (int)total); } int RGWGetObj_REST::get_params() diff --git a/src/rgw/rgw_rest.h b/src/rgw/rgw_rest.h index ae8cf4eab0a..b0ba54965fa 100644 --- a/src/rgw/rgw_rest.h +++ b/src/rgw/rgw_rest.h @@ -189,7 +189,7 @@ extern void dump_content_length(struct req_state *s, size_t len); extern void dump_etag(struct req_state *s, const char *etag); extern void dump_last_modified(struct req_state *s, time_t t); extern void abort_early(struct req_state *s, int err); -extern void dump_range(struct req_state *s, uint64_t ofs, uint64_t end, uint64_t total_size); +extern void dump_range(struct req_state *s, off_t ofs, off_t end, size_t total_size); extern void dump_continue(struct req_state *s); extern void list_all_buckets_end(struct req_state *s); extern void dump_time(struct req_state *s, const char *name, time_t *t); |