Changeset 4537 for pjproject/trunk/pjlib-util/src/pjlib-util/cli_telnet.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/cli_telnet.c (modified) (11 diffs)

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

@@ -34 +34 @@
 
 #if (defined(PJ_WIN32) && PJ_WIN32!=0) || \
+    (defined(PJ_WIN64) && PJ_WIN64!=0) || \
     (defined(PJ_WIN32_WINCE) && PJ_WIN32_WINCE!=0)
 
@@ -688 +689 @@
     pj_str_t send_data;
     char data_str[256];
-    unsigned len;
+    pj_size_t len;
     unsigned i;
     cli_telnet_fe *fe = (cli_telnet_fe *)sess->base.fe;
@@ -761 +762 @@
 {
     unsigned i;
-    unsigned len;
+    pj_size_t len;
     pj_str_t send_data;
     char data[1028];
@@ -993 +994 @@
                                pool, &info);    
 
-    len = pj_ansi_strlen((char *)sess->rcmd->rbuf);
+    len = (unsigned)pj_ansi_strlen((char *)sess->rcmd->rbuf);
 
     switch (status) {
@@ -1034 +1035 @@
                           info.hint[0].name.slen);
 
-                len += info.hint[0].name.slen;
+                len += (unsigned)info.hint[0].name.slen;
                 sess->rcmd->rbuf[len] = 0;                  
             }
@@ -1167 +1168 @@
         pj_ansi_strncpy((char*)&sess->rcmd->rbuf, history->ptr, history->slen);
         sess->rcmd->rbuf[history->slen] = 0;
-        sess->rcmd->len = history->slen;
+        sess->rcmd->len = (unsigned)history->slen;
         sess->rcmd->cur_pos = sess->rcmd->len;
         return PJ_TRUE;
@@ -1257 +1258 @@
             pj_ansi_snprintf((char *)sess->buf + CLI_TELNET_BUF_SIZE,
                              MAX_CUT_MSG_LEN, CUT_MSG);
-            sess->buf_len = CLI_TELNET_BUF_SIZE +
+            sess->buf_len = (unsigned)(CLI_TELNET_BUF_SIZE +
                             pj_ansi_strlen((char *)sess->buf+
-                                           CLI_TELNET_BUF_SIZE);
+                                            CLI_TELNET_BUF_SIZE));
         } else
             sess->buf_len += clen;
@@ -1295 +1296 @@
         while (!pj_scan_is_eof(&scanner)) {                 
             pj_scan_get_until_ch(&scanner, '\n', &out_str);         
-            str_len = scanner.curptr - str_begin;
+            str_len = (int)(scanner.curptr - str_begin);
             if (*scanner.curptr == '\n') {              
                 if ((str_len > 1) && (out_str.ptr[str_len-2] == '\r')) 
@@ -1301 +1302 @@
                     continue;
                 } else {                    
-                    int str_pos = str_begin - scanner.begin;
+                    int str_pos = (int)(str_begin - scanner.begin);
 
                     if (str_len > 0) {
@@ -1317 +1318 @@
             } else {
                 pj_str_t s;
-                int str_pos = str_begin - scanner.begin;
+                int str_pos = (int)(str_begin - scanner.begin);
 
                 pj_strset(&s, &str->ptr[str_pos], str_len);
@@ -1359 +1360 @@
 
 static void telnet_fe_write_log(pj_cli_front_end *fe, int level,
-                                const char *data, int len)
+                                const char *data, pj_size_t len)
 {
     cli_telnet_fe *tfe = (cli_telnet_fe *)fe;