Changeset 4761 for pjproject

Timestamp:

Feb 24, 2014 9:02:44 AM (11 years ago)

Author:

nanang

Message:

Re #1680: Fixed compile warnings on VS2005 for x64/win64 config.

Location:

pjproject/trunk

Files:

• pjlib-util/src/pjlib-util-test/json_test.c (modified) (2 diffs)
• pjlib-util/src/pjlib-util/json.c (modified) (4 diffs)
• pjlib/src/pj/errno.c (modified) (2 diffs)
• pjlib/src/pj/log.c (modified) (1 diff)
• pjsip/src/pjsua2/json.cpp (modified) (1 diff)
• pjsip/src/pjsua2/siptypes.cpp (modified) (2 diffs)

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

@@ -64 +64 @@
     pool = pj_pool_create(mem, "json", 1000, 1000, NULL);
 
-    size = strlen(json_doc1);
+    size = (unsigned)strlen(json_doc1);
     elem = pj_json_parse(pool, json_doc1, &size, &err);
     if (!elem) {
@@ -71 +71 @@
     }
 
-    size = strlen(json_doc1) * 2;
+    size = (unsigned)strlen(json_doc1) * 2;
     out_buf = pj_pool_alloc(pool, size);
 

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

@@ -196 +196 @@
 on_error:
     output->slen = op - output->ptr;
-    return ip - token.ptr;
+    return (unsigned)(ip - token.ptr);
 }
 
@@ -335 +335 @@
     }
 
-    *size = (buffer + *size) - st.scanner.curptr;
+    *size = (unsigned)((buffer + *size) - st.scanner.curptr);
 
     pj_scan_fini(&st.scanner);
@@ -472 +472 @@
         }
 
-        CHECK( st->writer( buf, op-buf, st->user_data) );
+        CHECK( st->writer( buf, (unsigned)(op-buf), st->user_data) );
         op = buf;
     }
@@ -550 +550 @@
             {
                 CHECK( st->writer( st->space,
-                                   PJ_JSON_NAME_MIN_LEN - elem->name.slen,
+                                   (unsigned)(PJ_JSON_NAME_MIN_LEN -
+                                              elem->name.slen),
                                    st->user_data) );
             }

pjproject/trunk/pjlib/src/pj/errno.c

@@ -110 +110 @@
     len = pj_ansi_snprintf( buf, size, "Unknown pjlib error %d", code);
     if (len < 1 || len >= (int)size)
-        len = size - 1;
+        len = (int)(size - 1);
     return len;
 }
@@ -206 +206 @@
 
     if (len < 1 || len >= (int)bufsize) {
-        len = bufsize - 1;
+        len = (int)(bufsize - 1);
         buf[len] = '\0';
     }

pjproject/trunk/pjlib/src/pj/log.c

@@ -285 +285 @@
     if (thread_suspended_tls_id != -1) 
     {
-        pj_thread_local_set(thread_suspended_tls_id, (void*)PJ_FALSE);
+        pj_thread_local_set(thread_suspended_tls_id,
+                            (void*)(pj_size_t)PJ_FALSE);
     }
     else

pjproject/trunk/pjsip/src/pjsua2/json.cpp

@@ -181 +181 @@
                             "Document already initialized");
 
-    unsigned size = input.size();
+    unsigned size = (unsigned)input.size();
     char *buffer = (char*)pj_pool_alloc(pool, size+1);
     unsigned parse_size = (unsigned)size;

pjproject/trunk/pjsip/src/pjsua2/siptypes.cpp

@@ -164 +164 @@
     ts.password         = str2Pj(this->password);
     ts.method           = this->method;
-    ts.ciphers_num      = this->ciphers.size();
+    ts.ciphers_num      = (unsigned)this->ciphers.size();
     // The following will only work if sizeof(enum)==sizeof(int)
     pj_assert(sizeof(ts.ciphers[0]) == sizeof(int));
@@ -425 +425 @@
     pjMsgBody.clone_data    = &pjsip_clone_text_data;
     pjMsgBody.data          = (void*)body.c_str();
-    pjMsgBody.len           = body.size();
+    pjMsgBody.len           = (unsigned)body.size();
     pjMpp.body = &pjMsgBody;