add (int) casts to some strlen() invocations to prevent warnings

diff --git a/src/buf.c b/src/buf.c
index 5cfce60a444257c1a9b0f2d491df5c113f533790..c03b85f9dd2d6a578b200198c2295871cb4a8507 100644 (file)
--- a/src/buf.c
+++ b/src/buf.c
@@ -143,7 +143,7 @@ struct Buf *buf_strnappend (struct Buf *buf, const char *str, int n)
 /* Appends characters in str to buf. */
 struct Buf *buf_strappend (struct Buf *buf, const char *str)
 {
-       return buf_strnappend (buf, str, strlen (str));
+       return buf_strnappend (buf, str, (int) strlen (str));
 }
 
 /* appends "#define str def\n" */

diff --git a/src/misc.c b/src/misc.c
index 37a52bbcc043218969551e269e18be37c8cc9832..0d93e4bb91f7de06ae97719cdba369081a72a59e 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -138,7 +138,7 @@ static void action_m4_define (const char *defname, const char * value)
 /* Append "new_text" to the running buffer. */
 void add_action (const char *new_text)
 {
-       int     len = strlen (new_text);
+       int     len = (int) strlen (new_text);
 
        while (len + action_index >= action_size - 10 /* slop */ ) {
                int     new_size = action_size * 2;

diff --git a/src/scan.l b/src/scan.l
index d2c21b39a5ceffc3f060a66abba8c8104fcc5ba3..59c2c19d39736c2d24249c5c432dc456c6b865a9 100644 (file)
--- a/src/scan.l
+++ b/src/scan.l
@@ -272,8 +272,8 @@ M4QEND      "]]"
                 buf_strnappend(&top_buf, yytext, yyleng);
             }
 
-    {M4QSTART}  buf_strnappend(&top_buf, escaped_qstart, strlen(escaped_qstart));
-    {M4QEND}    buf_strnappend(&top_buf, escaped_qend, strlen(escaped_qend));
+    {M4QSTART}  buf_strnappend(&top_buf, escaped_qstart, (int) strlen(escaped_qstart));
+    {M4QEND}    buf_strnappend(&top_buf, escaped_qend, (int) strlen(escaped_qend));
 
     [^{}\r\n]  {
                 buf_strnappend(&top_buf, yytext, yyleng);

diff --git a/src/scanopt.c b/src/scanopt.c
index f173997cb3d008485a4317954553a2728d6132a8..d829d0ff7331e4f63210f075a74593cbc54e979d 100644 (file)
--- a/src/scanopt.c
+++ b/src/scanopt.c
@@ -178,7 +178,7 @@ scanopt_t *scanopt_init (const optspec_t *options, int argc, char **argv, int fl
                        pname = (const unsigned char *)(opt->opt_fmt + 1);
                        s->has_short = 1;
                }
-               aux->printlen = strlen (opt->opt_fmt);
+               aux->printlen = (int) strlen (opt->opt_fmt);
 
                aux->namelen = 0;
                for (p = pname + 1; *p; p++) {
@@ -359,7 +359,7 @@ int     scanopt_usage (scanopt_t *scanner, FILE *fp, const char *usage)
                        maxlen[0] = len;
 
                /* It's much easier to calculate length for description column! */
-               len = strlen (DESC (s, ue->idx));
+               len = (int) strlen (DESC (s, ue->idx));
                if (len > maxlen[1])
                        maxlen[1] = len;
        }
@@ -738,7 +738,7 @@ int     scanopt (scanopt_t *svoid, char **arg, int *optindex)
                        arglen = 0;
                }
                else
-                       arglen = strlen (optarg);
+                       arglen = (int) strlen (optarg);
        }
 
        /* At this point, we have a long or short option matched at opt_offset into

diff --git a/src/tables.c b/src/tables.c
index ae2ad9c5d817e1debc3e623fb0b00cec2d962d70..ff89b4d87fdb527eb967c1afd0feb97e6f5efc71 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -158,12 +158,12 @@ int yytbl_hdr_fwrite (struct yytbl_writer *wr, const struct yytbl_hdr *th)
                flex_die (_("th_ssize|th_flags write failed"));
        bwritten += 6;
 
-       sz = strlen (th->th_version) + 1;
+       sz = (int) strlen (th->th_version) + 1;
        if ((rv = yytbl_writen (wr, th->th_version, sz)) != sz)
                flex_die (_("th_version writen failed"));
        bwritten += rv;
 
-       sz = strlen (th->th_name) + 1;
+       sz = (int) strlen (th->th_name) + 1;
        if ((rv = yytbl_writen (wr, th->th_name, sz)) != sz)
                flex_die (_("th_name writen failed"));
        bwritten += rv;