Changeset 3095 for pjproject/trunk/pjlib-util/src/pjlib-util/http_client.c
- Timestamp:
- Feb 10, 2010 10:45:07 AM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjlib-util/src/pjlib-util/http_client.c
r3092 r3095 57 57 }; 58 58 59 static c har *http_protocol_names[NUM_PROTOCOL] =59 static const char *http_protocol_names[NUM_PROTOCOL] = 60 60 { 61 61 "HTTP", … … 76 76 }; 77 77 78 static c har *http_method_names[3] =78 static const char *http_method_names[3] = 79 79 { 80 80 "GET", … … 156 156 } 157 157 158 static c har * get_protocol(const pj_str_t *protocol)158 static const char * get_protocol(const pj_str_t *protocol) 159 159 { 160 160 int i; … … 470 470 pj_size_t i; 471 471 char *cptr; 472 void*newdata;472 char *newdata; 473 473 pj_scanner scanner; 474 474 pj_str_t s; … … 502 502 response->content_length = -1; 503 503 504 newdata = pj_pool_alloc(pool, i);504 newdata = (char*) pj_pool_alloc(pool, i); 505 505 pj_memcpy(newdata, data, i); 506 506 … … 524 524 525 525 /* Parse the response headers. */ 526 size = i - 2 - (scanner.curptr - (char *)newdata);526 size = i - 2 - (scanner.curptr - newdata); 527 527 if (size > 0) { 528 528 status = http_headers_parse(scanner.curptr + 1, size, … … 605 605 pj_bzero(param, sizeof(*param)); 606 606 param->addr_family = pj_AF_INET(); 607 pj_strset2(¶m->method, http_method_names[HTTP_GET]);608 pj_strset2(¶m->version, HTTP_1_0);607 pj_strset2(¶m->method, (char*)http_method_names[HTTP_GET]); 608 pj_strset2(¶m->version, (char*)HTTP_1_0); 609 609 param->timeout.msec = PJ_HTTP_DEFAULT_TIMEOUT; 610 610 pj_time_val_normalize(¶m->timeout); … … 631 631 pj_scan_get_until_ch(&scanner, ':', &s); 632 632 if (!pj_stricmp2(&s, http_protocol_names[PROTOCOL_HTTP])) { 633 pj_strset2(&hurl->protocol, http_protocol_names[PROTOCOL_HTTP]); 633 pj_strset2(&hurl->protocol, 634 (char*)http_protocol_names[PROTOCOL_HTTP]); 634 635 } else if (!pj_stricmp2(&s, http_protocol_names[PROTOCOL_HTTPS])) { 635 pj_strset2(&hurl->protocol, http_protocol_names[PROTOCOL_HTTPS]); 636 pj_strset2(&hurl->protocol, 637 (char*)http_protocol_names[PROTOCOL_HTTPS]); 636 638 } else { 637 639 PJ_THROW(PJ_ENOTSUP); // unsupported protocol … … 913 915 TRACE_((THIS_FILE, "%s", pkt.ptr)); 914 916 } else { 915 pkt.ptr = hreq->param.reqdata.data;917 pkt.ptr = (char*)hreq->param.reqdata.data; 916 918 pkt.slen = hreq->param.reqdata.size; 917 919 }
Note: See TracChangeset
for help on using the changeset viewer.