Skip to content

Commit

Permalink
rgw: dump_status() uses integer
Browse files Browse the repository at this point in the history
so that we can avoid atoi() later

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
  • Loading branch information
yehudasa committed Dec 18, 2015
1 parent 2a12ffc commit 744a29a
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 19 deletions.
6 changes: 3 additions & 3 deletions src/rgw/rgw_civetweb.cc
Expand Up @@ -145,21 +145,21 @@ void RGWMongoose::init_env(CephContext *cct)
}
}

int RGWMongoose::send_status(const char *status, const char *status_name)
int RGWMongoose::send_status(int status, const char *status_name)
{
char buf[128];

if (!status_name)
status_name = "";

snprintf(buf, sizeof(buf), "HTTP/1.1 %s %s\r\n", status, status_name);
snprintf(buf, sizeof(buf), "HTTP/1.1 %d %s\r\n", status, status_name);

bufferlist bl;
bl.append(buf);
bl.append(header_data);
header_data = bl;

status_num = atoi(status);
status_num = status;
mg_set_http_status(conn, status_num);

return 0;
Expand Down
2 changes: 1 addition & 1 deletion src/rgw/rgw_civetweb.h
Expand Up @@ -33,7 +33,7 @@ class RGWMongoose : public RGWClientIO
int write_data(const char *buf, int len);
int read_data(char *buf, int len);

int send_status(const char *status, const char *status_name);
int send_status(int status, const char *status_name);
int send_100_continue();
int complete_header();
int complete_request();
Expand Down
2 changes: 1 addition & 1 deletion src/rgw/rgw_client_io.h
Expand Up @@ -36,7 +36,7 @@ class RGWClientIO {
virtual void flush() = 0;
int read(char *buf, int max, int *actual);

virtual int send_status(const char *status, const char *status_name) = 0;
virtual int send_status(int status, const char *status_name) = 0;
virtual int send_100_continue() = 0;
virtual int complete_header() = 0;
virtual int complete_request() = 0;
Expand Down
8 changes: 4 additions & 4 deletions src/rgw/rgw_fcgi.cc
Expand Up @@ -31,15 +31,15 @@ void RGWFCGX::init_env(CephContext *cct)
env.init(cct, (char **)fcgx->envp);
}

int RGWFCGX::send_status(const char *status, const char *status_name)
int RGWFCGX::send_status(int status, const char *status_name)
{
status_num = atoi(status);
return print("Status: %s %s\r\n", status, status_name);
status_num = status;
return print("Status: %d %s\r\n", status, status_name);
}

int RGWFCGX::send_100_continue()
{
int r = send_status("100", "Continue");
int r = send_status(100, "Continue");
if (r >= 0) {
flush();
}
Expand Down
2 changes: 1 addition & 1 deletion src/rgw/rgw_fcgi.h
Expand Up @@ -21,7 +21,7 @@ class RGWFCGX : public RGWClientIO
int write_data(const char *buf, int len);
int read_data(char *buf, int len);

int send_status(const char *status, const char *status_name);
int send_status(int status, const char *status_name);
int send_100_continue();
int complete_header();
int complete_request() { return 0; }
Expand Down
2 changes: 1 addition & 1 deletion src/rgw/rgw_loadgen.cc
Expand Up @@ -92,7 +92,7 @@ void RGWLoadGenIO::init_env(CephContext *cct)
env.set("SERVER_PORT", port_buf);
}

int RGWLoadGenIO::send_status(const char *status, const char *status_name)
int RGWLoadGenIO::send_status(int status, const char *status_name)
{
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion src/rgw/rgw_loadgen.h
Expand Up @@ -34,7 +34,7 @@ class RGWLoadGenIO : public RGWClientIO
int write_data(const char *buf, int len);
int read_data(char *buf, int len);

int send_status(const char *status, const char *status_name);
int send_status(int status, const char *status_name);
int send_100_continue();
int complete_header();
int complete_request();
Expand Down
10 changes: 3 additions & 7 deletions src/rgw/rgw_rest.cc
Expand Up @@ -247,7 +247,7 @@ static bool rgw_find_host_in_domains(const string& host, string *domain, string
return false;
}

static void dump_status(struct req_state *s, const char *status, const char *status_name)
static void dump_status(struct req_state *s, int status, const char *status_name)
{
int r = s->cio->send_status(status, status_name);
if (r < 0) {
Expand Down Expand Up @@ -326,16 +326,12 @@ void dump_errno(const struct rgw_err &err, string& out) {

void dump_errno(struct req_state *s)
{
char buf[32];
snprintf(buf, sizeof(buf), "%d", s->err.http_ret);
dump_status(s, buf, http_status_names[s->err.http_ret]);
dump_status(s, s->err.http_ret, http_status_names[s->err.http_ret]);
}

void dump_errno(struct req_state *s, int http_ret)
{
char buf[32];
snprintf(buf, sizeof(buf), "%d", http_ret);
dump_status(s, buf, http_status_names[http_ret]);
dump_status(s, http_ret, http_status_names[http_ret]);
}

void dump_string_header(struct req_state *s, const char *name, const char *val)
Expand Down

0 comments on commit 744a29a

Please sign in to comment.