Changeset 4537 for pjproject/trunk/pjlib-util/src/pjlib-util/http_client.c

Timestamp:

Jun 19, 2013 6:47:43 AM (11 years ago)

Author:

riza

Message:

Re #1680: Add initial support for Win64

File:

• pjproject/trunk/pjlib-util/src/pjlib-util/http_client.c (modified) (9 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/http_client.c

@@ -230 +230 @@
 
     if (sent <= 0) {
-        hreq->error = (sent < 0 ? -sent : PJLIB_UTIL_EHTTPLOST);
+        hreq->error = (sent < 0 ? (pj_status_t)-sent : PJLIB_UTIL_EHTTPLOST);
         pj_http_req_cancel(hreq, PJ_TRUE);
         return PJ_FALSE;
@@ -774 +774 @@
  * present, NULL will be returned.
  */
-static char *get_url_at_pos(const char *str, long len)
+static char *get_url_at_pos(const char *str, pj_size_t len)
 {
     const char *end = str + len;
@@ -802 +802 @@
 {
     pj_scanner scanner;
-    int len = url->slen;
+    pj_size_t len = url->slen;
     PJ_USE_EXCEPTION;
 
@@ -974 +974 @@
         pj_assert(user_pos != 0 && user_pos < at_pos);
         user_pos += 2;
-        removed_len = at_pos + 1 - user_pos;
+        removed_len = (int)(at_pos + 1 - user_pos);
         pj_memmove(user_pos, at_pos+1, hreq->url.ptr+hreq->url.slen-at_pos-1);
         hreq->url.slen -= removed_len;
@@ -1160 +1160 @@
         phdr->name = pj_str("Proxy-Authorization");
 
-    len = PJ_BASE256_TO_BASE64_LEN(user_pass.slen) + 10;
+    len = (int)(PJ_BASE256_TO_BASE64_LEN(user_pass.slen) + 10);
     phdr->value.ptr = (char*)pj_pool_alloc(hreq->pool, len);
     phdr->value.slen = 0;
 
     pj_strcpy2(&phdr->value, "Basic ");
-    len -= phdr->value.slen;
+    len -= (int)phdr->value.slen;
     pj_base64_encode((pj_uint8_t*)user_pass.ptr, (int)user_pass.slen,
                      phdr->value.ptr + phdr->value.slen, &len);
@@ -1176 +1176 @@
 #define MD5_STRLEN 32
 /* A macro just to get rid of type mismatch between char and unsigned char */
-#define MD5_APPEND(pms,buf,len) pj_md5_update(pms, (const pj_uint8_t*)buf, len)
+#define MD5_APPEND(pms,buf,len) pj_md5_update(pms, (const pj_uint8_t*)buf, \
+                   (unsigned)len)
 
 /* Transform digest to string.
@@ -1338 +1339 @@
 
     /* Allocate space for the header */
-    len = 8 + /* Digest */
+    len = (int)(8 + /* Digest */
           16 + hreq->param.auth_cred.username.slen + /* username= */
           12 + chal->realm.slen + /* realm= */
@@ -1349 +1350 @@
           30 + /* cnonce= */
           12 + chal->opaque.slen + /* opaque=".." */
-          0;
+          0);
     phdr->value.ptr = (char*)pj_pool_alloc(hreq->pool, len);
 
@@ -1538 +1539 @@
             /* Header field "Content-Length" */
             pj_utoa(hreq->param.reqdata.total_size ? 
-                    hreq->param.reqdata.total_size: 
-                    hreq->param.reqdata.size, buf);
+                    (unsigned long)hreq->param.reqdata.total_size: 
+                    (unsigned long)hreq->param.reqdata.size, buf);
             str_snprintf(&pkt, BUF_SIZE, PJ_TRUE, "%s: %s\r\n",
                          CONTENT_LENGTH, buf);