maria-developers team mailing list archive

[Michael Widenius <monty@xxxxxxxxxxxx>]

Hi!

>>>>> "noreply" == noreply  <noreply@xxxxxxxxxxxxx> writes:

noreply> === modified file 'mysys/my_getopt.c'
noreply> --- mysys/my_getopt.c	2009-04-25 10:05:32 +0000
noreply> +++ mysys/my_getopt.c	2009-05-20 15:34:34 +0000
noreply> @@ -647,7 +647,7 @@
noreply>  	return EXIT_OUT_OF_MEMORY;
noreply>        break;
noreply>      case GET_ENUM:
noreply> -      if (((*(int*)result_pos)= find_type(argument, opts->typelib, 2) - 1) < 0)
noreply> +      if (((*(ulong *)result_pos)= find_type(argument, opts->typelib, 2) - 1) < 0)
noreply>          return EXIT_ARGUMENT_INVALID;
noreply>        break;
noreply>      case GET_SET:
noreply> @@ -983,7 +983,7 @@
noreply>      *((int*) variable)= (int) getopt_ll_limit_value((int) value, option, NULL);
noreply>      break;
noreply>    case GET_ENUM:
noreply> -    *((uint*) variable)= (uint) value;
noreply> +    *((ulong*) variable)= (uint) value;
noreply>      break;
noreply>    case GET_UINT:
noreply>      *((uint*) variable)= (uint) getopt_ull_limit_value((uint) value, option, NULL);
noreply> @@ -1221,7 +1221,7 @@
noreply>  	}
noreply>  	break;
noreply>        case GET_ENUM:
noreply> -        printf("%s\n", get_type(optp->typelib, *(uint*) value));
noreply> +        printf("%s\n", get_type(optp->typelib, *(ulong*) value));
noreply>  	break;
noreply>        case GET_STR:
noreply>        case GET_STR_ALLOC:                    /* fall through */

Where is the enum used that caused this to break ?
(I did a grep of GET_ENUM in the current tree, but couldn't find anything.

As an ENUM can only contain a small set of values, it would be more
logical that it should be an uint ant not an ulong.
(With some 64 bit compilers, uint -> 32 bit while ulong is 64 bit, so
there is a clear advantage in using uint)

Becasue of this, I am more included to belive the the one that is
using GET_ENUM as ulong is doing things wrong instead of the above
code.

Regards,
Monty