[tcl-rivet] 02/02: typecasts of pointer arithmetics into int as suggested by VS C compiler

[mxmanghi]

This is an automated email from the ASF dual-hosted git repository.

mxmanghi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git

commit aa1fec6f32081e43331e4b807eada39d11a114df
Author: Massimo Manghi <mxman...@apache.org>
AuthorDate: Mon Dec 3 18:08:02 2018 +0100

    typecasts of pointer arithmetics into int as suggested by VS C compiler
---
 ChangeLog                           | 7 +++++++
 src/mod_rivet_ng/mod_rivet_common.c | 2 +-
 src/parser/rivetParser.c            | 8 ++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a94ebdf..b6f026a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-12-03 Massimo Manghi <mxman...@apache.org>
+       * cmake/CMakeList.c: we infer the version number from the file
+       VERSION assumed to reside in the project root directory
+       * src/parser/rivetParser.c: 
+       * src/mod_rivet_ng/mod_rivet_common.c: type cast of pointer
+       arithmetics into int
+
 2018-11-23 Massimo Manghi <mxman...@apache.org>
     * VERSION,configure,ac: version number bumped to 3.2.0 as we created
     3.1 out of branch 3.0 in order to highlight possible regressions that
diff --git a/src/mod_rivet_ng/mod_rivet_common.c 
b/src/mod_rivet_ng/mod_rivet_common.c
index d40864d..7c3b8a8 100644
--- a/src/mod_rivet_ng/mod_rivet_common.c
+++ b/src/mod_rivet_ng/mod_rivet_common.c
@@ -98,7 +98,7 @@ Rivet_ReadFile (apr_pool_t* pool,char* filename,
 
     apr_file_close(apr_fp);
  
-    *nbytes = buffer_size;
+    *nbytes = (int)buffer_size;
     return 0;
 }
 
diff --git a/src/parser/rivetParser.c b/src/parser/rivetParser.c
index b946008..fe978a3 100644
--- a/src/parser/rivetParser.c
+++ b/src/parser/rivetParser.c
@@ -239,8 +239,8 @@ Rivet_Parser(Tcl_Obj *outbuf, Tcl_Obj *inbuf)
     const char *strstart = START_TAG;
     const char *strend = END_TAG;
 
-    int endseqlen = strlen(END_TAG);
-    int startseqlen = strlen(START_TAG);
+    int endseqlen      =       (int) strlen(END_TAG);
+    int startseqlen =  (int) strlen(START_TAG);
     int inside = 0, p = 0, check_echo = 0;
     int inLen = 0;
 
@@ -297,7 +297,7 @@ Rivet_Parser(Tcl_Obj *outbuf, Tcl_Obj *inbuf)
                         Tcl_AppendToObj(outbuf, "\\\\", 2);
                         break;
                     default:
-                        Tcl_AppendToObj(outbuf, cur, next - cur);
+                        Tcl_AppendToObj(outbuf, cur, (int)(next - cur));
                         break;
                 }
                 continue;
@@ -328,7 +328,7 @@ Rivet_Parser(Tcl_Obj *outbuf, Tcl_Obj *inbuf)
                     Tcl_AppendToObj(outbuf, (char *)strend, p);
                     p = 0;
                 }
-                Tcl_AppendToObj(outbuf, cur, next - cur);
+                Tcl_AppendToObj(outbuf, cur, (int)(next - cur));
             }
         }
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@tcl.apache.org
For additional commands, e-mail: commits-h...@tcl.apache.org