Changeset 4550

Timestamp:

Jul 2, 2013 11:45:57 AM (11 years ago)

Author:

riza

Message:

Re #1680:

• Win64 Project properties modification, using x64 as target machine.
• Fix incorrect data type which might result in unsafe code.

Location:

pjproject/trunk

Files:

• build/vs/pjproject-vs8-win64-common-defaults.vsprops (modified) (1 diff)
• pjlib/src/pjlib-test/ioq_tcp.c (modified) (2 diffs)
• pjsip/src/pjsip/sip_msg.c (modified) (1 diff)
• pjsip/src/test/msg_test.c (modified) (3 diffs)

pjproject/trunk/build/vs/pjproject-vs8-win64-common-defaults.vsprops

@@ -12 +12 @@
                 Name="VCLinkerTool"
                 SubSystem="1"
-                TargetMachine="1"
+                TargetMachine="17"
         />
         <UserMacro

pjproject/trunk/pjlib/src/pjlib-test/ioq_tcp.c

@@ -255 +255 @@
     int bufsize = BUF_MIN_SIZE;
     int status = -1;
-    pj_ssize_t pending_op = 0;
+    int pending_op = 0;
     pj_timestamp t_elapsed;
     pj_str_t s;
@@ -468 +468 @@
         pj_ioqueue_destroy(ioque);
     pj_pool_release(pool);
-    return (int)status;
+    return status;
 
 }

pjproject/trunk/pjsip/src/pjsip/sip_msg.c

@@ -400 +400 @@
 {
     char *p=buf, *end=buf+size;
-    pj_size_t len;
+    pj_ssize_t len;
     pjsip_hdr *hdr;
     pj_str_t clen_hdr =  { "Content-Length: ", 16};

pjproject/trunk/pjsip/src/test/msg_test.c

@@ -1889 +1889 @@
         struct hdr_test_t  *test = &hdr_test_data[i];
         pj_str_t hname;
-        pj_size_t len;
+        pj_ssize_t len;
         int parsed_len;
         pj_pool_t *pool;
@@ -1996 +1996 @@
         unsigned print;
     } run[COUNT];
-    unsigned i, max;
-    int avg_len;
+    unsigned i, max, avg_len;
     char desc[250];
     pj_status_t status;
@@ -2019 +2018 @@
     /* Calculate average message length */
     for (i=0, avg_len=0; i<PJ_ARRAY_SIZE(test_array); ++i) {
-        avg_len += (int)test_array[i].len;
+        avg_len += (unsigned)test_array[i].len;
     }
     avg_len /= PJ_ARRAY_SIZE(test_array);