From 9160ceb67ff5317753ff71c623b037126862a32f Mon Sep 17 00:00:00 2001 From: rlar Date: Sun, 28 Feb 2016 21:12:45 +0100 Subject: cast to get rid of warnings --- src/main.c | 10 +++++----- src/misc.c | 6 +++--- src/regex.c | 10 +++++----- src/scan.l | 2 +- src/scanopt.c | 12 ++++++------ src/tables_shared.c | 4 ++-- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/main.c b/src/main.c index 4e5254a..e1edac3 100644 --- a/src/main.c +++ b/src/main.c @@ -360,14 +360,14 @@ void check_options (void) } else { do { char m4_path[PATH_MAX]; - int length = strlen(path); + size_t length = strlen(path); struct stat sbuf; const char *endOfDir = strchr(path, ':'); if (!endOfDir) endOfDir = path+length; - if ((endOfDir-path+2) >= sizeof(m4_path)) { + if (endOfDir + 2 >= path + sizeof(m4_path)) { path = endOfDir+1; continue; } @@ -413,7 +413,7 @@ void check_options (void) FILE *tablesout; struct yytbl_hdr hdr; char *pname = 0; - int nbytes = 0; + size_t nbytes = 0; buf_m4_define (&m4defs_buf, "M4_YY_TABLES_EXTERNAL", NULL); @@ -1124,7 +1124,7 @@ void flexinit (int argc, char **argv) break; case OPT_PREPROC_LEVEL: - preproc_level = strtol(arg,NULL,0); + preproc_level = (int) strtol(arg,NULL,0); break; case OPT_MAIN: @@ -1287,7 +1287,7 @@ void flexinit (int argc, char **argv) } else { buf_strnappend (&userdef_buf, arg, - def - arg); + (int) (def - arg)); buf_strappend (&userdef_buf, " "); buf_strappend (&userdef_buf, def + 1); diff --git a/src/misc.c b/src/misc.c index 62a29d9..ceda60d 100644 --- a/src/misc.c +++ b/src/misc.c @@ -167,7 +167,7 @@ void add_action (const char *new_text) void *allocate_array (int size, size_t element_size) { void *mem; - size_t num_bytes = element_size * size; + size_t num_bytes = element_size * (size_t) size; mem = malloc(num_bytes); if (!mem) @@ -692,7 +692,7 @@ char *readable_form (int c) return "' '"; else { - rform[0] = c; + rform[0] = (char) c; rform[1] = '\0'; return rform; @@ -705,7 +705,7 @@ char *readable_form (int c) void *reallocate_array (void *array, int size, size_t element_size) { void *new_array; - size_t num_bytes = element_size * size; + size_t num_bytes = element_size * (size_t) size; new_array = realloc(array, num_bytes); if (!new_array) diff --git a/src/regex.c b/src/regex.c index 84f0e9e..b44d958 100644 --- a/src/regex.c +++ b/src/regex.c @@ -54,7 +54,7 @@ void flex_regcomp(regex_t *preg, const char *regex, int cflags) memset (preg, 0, sizeof (regex_t)); if ((err = regcomp (preg, regex, cflags)) != 0) { - const int errbuf_sz = 200; + const size_t errbuf_sz = 200; char *errbuf, *rxerr; errbuf = malloc(errbuf_sz * sizeof(char)); @@ -80,11 +80,11 @@ void flex_regcomp(regex_t *preg, const char *regex, int cflags) char *regmatch_dup (regmatch_t * m, const char *src) { char *str; - int len; + size_t len; if (m == NULL || m->rm_so < 0) return NULL; - len = m->rm_eo - m->rm_so; + len = (size_t) (m->rm_eo - m->rm_so); str = malloc((len + 1) * sizeof(char)); if (!str) flexfatal(_("Unable to allocate a copy of the match")); @@ -107,7 +107,7 @@ char *regmatch_cpy (regmatch_t * m, char *dest, const char *src) return dest; } - snprintf (dest, regmatch_len(m), "%s", src + m->rm_so); + snprintf (dest, (size_t) regmatch_len(m), "%s", src + m->rm_so); return dest; } @@ -150,7 +150,7 @@ int regmatch_strtol (regmatch_t * m, const char *src, char **endptr, else s = regmatch_dup (m, src); - n = strtol (s, endptr, base); + n = (int) strtol (s, endptr, base); if (s != buf) free (s); diff --git a/src/scan.l b/src/scan.l index cfc832d..65bdf89 100644 --- a/src/scan.l +++ b/src/scan.l @@ -685,7 +685,7 @@ nmstr[yyleng - 2 - end_is_ws] = '\0'; /* chop trailing brace */ else { /* push back name surrounded by ()'s */ - int len = strlen( nmdefptr ); + size_t len = strlen( nmdefptr ); if (end_is_ws) unput(end_ch); diff --git a/src/scanopt.c b/src/scanopt.c index a118541..a475b6f 100644 --- a/src/scanopt.c +++ b/src/scanopt.c @@ -186,21 +186,21 @@ scanopt_t *scanopt_init (const optspec_t *options, int argc, char **argv, int fl if (*p == '=' || isspace ((unsigned char)*p) || !(aux->flags & IS_LONG)) { if (aux->namelen == 0) - aux->namelen = p - pname; + aux->namelen = (int) (p - pname); aux->flags |= ARG_REQ; aux->flags &= ~ARG_NONE; } /* detect optional arg. This overrides required arg. */ if (*p == '[') { if (aux->namelen == 0) - aux->namelen = p - pname; + aux->namelen = (int) (p - pname); aux->flags &= ~(ARG_REQ | ARG_NONE); aux->flags |= ARG_OPT; break; } } if (aux->namelen == 0) - aux->namelen = p - pname; + aux->namelen = (int) (p - pname); } return (scanopt_t *) s; } @@ -571,7 +571,7 @@ static int matchlongopt (char *str, char **optname, int *optlen, char **arg, int while (*p && *p != '=') ++p; - *optlen = p - *optname; + *optlen = (int) (p - *optname); if (!*p) /* an option with no '=...' part. */ @@ -583,7 +583,7 @@ static int matchlongopt (char *str, char **optname, int *optlen, char **arg, int *arg = p; while (*p) ++p; - *arglen = p - *arg; + *arglen = (int) (p - *arg); return 1; } @@ -614,7 +614,7 @@ static int find_opt (struct _scanopt_t *s, int lookup_long, char *optstart, int if (len > s->aux[i].namelen) continue; - if (strncmp (optname, optstart, len) == 0) { + if (strncmp (optname, optstart, (size_t) len) == 0) { nmatch++; *opt_offset = i; diff --git a/src/tables_shared.c b/src/tables_shared.c index 123626c..fca0438 100644 --- a/src/tables_shared.c +++ b/src/tables_shared.c @@ -57,7 +57,7 @@ dnl */ yyskel_static flex_int32_t yytbl_calc_total_len (const struct yytbl_data *tbl) { - flex_int32_t n; + flex_uint32_t n; /* total number of ints */ n = tbl->td_lolen; @@ -66,5 +66,5 @@ yyskel_static flex_int32_t yytbl_calc_total_len (const struct yytbl_data *tbl) if (tbl->td_id == YYTD_ID_TRANSITION) n *= 2; - return n; + return (flex_int32_t) n; } -- cgit v1.2.3