diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-04 08:24:06 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-04 08:24:06 +0300 |
| commit | 2c1067166d7e8a9541578220b408f1e553e23916 (patch) | |
| tree | 2ba0932f92d88e01d51393de63dda842f6daf320 /mysys/my_getopt.c | |
| parent | 2cf3e2ea2fca3d3613309de94d55c88dedb3831a (diff) | |
| parent | 61b2618d3aae78950f1b8dbe8d4482573c77875d (diff) | |
| download | mariadb-git-2c1067166d7e8a9541578220b408f1e553e23916.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'mysys/my_getopt.c')
| -rw-r--r-- | mysys/my_getopt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index 8eff81393d4..0edca1a72fd 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -1433,7 +1433,7 @@ static uint print_name(const struct my_option *optp) for (;*s;s++) putchar(*s == '_' ? '-' : *s); - return s - optp->name; + return (uint)(s - optp->name); } /** prints option comment with indentation and wrapping. @@ -1474,7 +1474,7 @@ static uint print_comment(const char *comment, putchar(' '); } printf("%s", comment); - return curpos + (end - comment); + return curpos + (int)(end - comment); } |