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

Timestamp:

Feb 10, 2010 10:45:07 AM (14 years ago)

Author:

bennylp

Message:

More ticket #1018: fixed some more warnings about pointer conversions, or errors if the library is compiled in C++ mode (thanks Atik Khan for the report)

File:

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

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

@@ -68 +68 @@
 
     while (!thread_quit) {
-        char *pkt = pj_pool_alloc(pool, srv->buf_size);
+        char *pkt = (char*)pj_pool_alloc(pool, srv->buf_size);
         pj_ssize_t pkt_len;
         int rc;
@@ -155 +155 @@
     send_size += sendsz;
 
-    sdata = pj_pool_alloc(pool, sendsz);
+    sdata = (char*)pj_pool_alloc(pool, sendsz);
     pj_create_random_string(sdata, sendsz);
     pj_ansi_sprintf(sdata, "\nSegment #%d\n", ++counter);
@@ -419 +419 @@
 #endif
 
-    pj_http_headers_add_elmt2(&param.headers, "Accept", 
-                              "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-ms-application, application/vnd.ms-xpsdocument, application/xaml+xml, application/x-ms-xbap, application/x-shockwave-flash, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/msword, */*");
-    pj_http_headers_add_elmt2(&param.headers, "Accept-Language", "en-sg");
-    pj_http_headers_add_elmt2(&param.headers, "User-Agent", 
-                              "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0; SLCC1; .NET CLR 2.0.50727; .NET CLR 3.0.04506)");
+    pj_http_headers_add_elmt2(&param.headers, (char*)"Accept",
+                             (char*)"image/gif, image/x-xbitmap, image/jpeg, "
+                                    "image/pjpeg, application/x-ms-application,"
+                                    " application/vnd.ms-xpsdocument, "
+                                    "application/xaml+xml, "
+                                    "application/x-ms-xbap, "
+                                    "application/x-shockwave-flash, "
+                                    "application/vnd.ms-excel, "
+                                    "application/vnd.ms-powerpoint, "
+                                    "application/msword, */*");
+    pj_http_headers_add_elmt2(&param.headers, (char*)"Accept-Language",
+                              (char*)"en-sg");
+    pj_http_headers_add_elmt2(&param.headers, (char*)"User-Agent",
+                              (char*)"Mozilla/4.0 (compatible; MSIE 7.0; "
+                                     "Windows NT 6.0; SLCC1; "
+                                     ".NET CLR 2.0.50727; "
+                                     ".NET CLR 3.0.04506)");
     if (pj_http_req_create(pool, &url, timer_heap, ioqueue, 
                            &param, &hcb, &http_req))
@@ -523 +535 @@
 
     pj_http_req_param_default(&param);
-    pj_strset2(&param.method, "PUT");
-    data = pj_pool_alloc(pool, length);
+    pj_strset2(&param.method, (char*)"PUT");
+    data = (char*)pj_pool_alloc(pool, length);
     pj_create_random_string(data, length);
     pj_ansi_sprintf(data, "PUT test\n");
@@ -613 +625 @@
 
     pj_http_req_param_default(&param);
-    pj_strset2(&param.method, "PUT");
+    pj_strset2(&param.method, (char*)"PUT");
     total_size = 15383;
     send_size = 0;
@@ -694 +706 @@
 
     pj_http_req_param_default(&param);
-    pj_strset2(&param.method, "DELETE");
+    pj_strset2(&param.method, (char*)"DELETE");
     if (pj_http_req_create(pool, &url, timer_heap, ioqueue, 
                            &param, &hcb, &http_req))