diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-01-16 11:41:16 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-01-16 11:41:16 +0000 |
commit | b3cac737802959c96ff35fb1b8a6a54e4a5f4812 (patch) | |
tree | 1be8e67d9d3d0064c8dd0b5132d06c3a1b168b40 /scanopt.c | |
parent | 6b3c38ce0f98e7fa0476621ac64e8602655fdadf (diff) | |
download | flex-b3cac737802959c96ff35fb1b8a6a54e4a5f4812.tar.gz |
Commit files from flex 2.5.37 tarball
Flex has a circular dependency on itself when build from git.
Diffstat (limited to 'scanopt.c')
-rw-r--r-- | scanopt.c | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -189,7 +189,7 @@ scanopt_t *scanopt_init (options, argc, argv, flags) s->aux = (struct _aux *) malloc (s->optc * sizeof (struct _aux)); for (i = 0; i < s->optc; i++) { - const char *p, *pname; + const Char *p, *pname; const struct optspec_t *opt; struct _aux *aux; @@ -200,11 +200,11 @@ scanopt_t *scanopt_init (options, argc, argv, flags) if (opt->opt_fmt[0] == '-' && opt->opt_fmt[1] == '-') { aux->flags |= IS_LONG; - pname = opt->opt_fmt + 2; + pname = (const Char *)(opt->opt_fmt + 2); s->has_long = 1; } else { - pname = opt->opt_fmt + 1; + pname = (const Char *)(opt->opt_fmt + 1); s->has_short = 1; } aux->printlen = strlen (opt->opt_fmt); @@ -481,7 +481,7 @@ int scanopt_usage (scanner, fp, usage) while (*p && n < maxlen[1] && *p != '\n') { - if (isspace (*p) + if (isspace ((Char)(*p)) || *p == '-') lastws = p; n++; @@ -504,8 +504,7 @@ int scanopt_usage (scanner, fp, usage) if (lastws) { fprintf (fp, "%.*s\n", - lastws - - pstart, + (int)(lastws - pstart), pstart); pstart = lastws + 1; |