Sort parameters by letter

For readability, sort the command-line arguments parsing by letter.
master
Romain Vimont 8 years ago
parent 9a07b694f1
commit d3c76c004e

@ -102,40 +102,47 @@ static void print_version(void) {
static int parse_args(struct args *args, int argc, char *argv[]) { static int parse_args(struct args *args, int argc, char *argv[]) {
static const struct option long_options[] = { static const struct option long_options[] = {
{"bit-rate", required_argument, NULL, 'b'},
{"help", no_argument, NULL, 'h'}, {"help", no_argument, NULL, 'h'},
{"port", required_argument, NULL, 'p'},
{"max-size", required_argument, NULL, 'm'}, {"max-size", required_argument, NULL, 'm'},
{"bit-rate", required_argument, NULL, 'b'}, {"port", required_argument, NULL, 'p'},
{"version", no_argument, NULL, 'v'}, {"version", no_argument, NULL, 'v'},
{NULL, 0, NULL, 0 }, {NULL, 0, NULL, 0 },
}; };
int c; int c;
while ((c = getopt_long(argc, argv, "hvp:m:b:", long_options, NULL)) != -1) { while ((c = getopt_long(argc, argv, "b:hm:p:v", long_options, NULL)) != -1) {
switch (c) { switch (c) {
case 'h': { case 'b': {
args->help = SDL_TRUE;
break;
}
case 'v': {
args->version = SDL_TRUE;
break;
}
case 'p': {
char *endptr; char *endptr;
if (*optarg == '\0') { if (*optarg == '\0') {
LOGE("Invalid port parameter is empty"); LOGE("Bit-rate parameter is empty");
return -1; return -1;
} }
long value = strtol(optarg, &endptr, 0); long value = strtol(optarg, &endptr, 0);
int mul = 1;
if (*endptr != '\0') { if (*endptr != '\0') {
LOGE("Invalid port: %s", optarg); if (optarg == endptr) {
LOGE("Invalid bit-rate: %s", optarg);
return -1; return -1;
} }
if (value & ~0xffff) { if ((*endptr == 'M' || *endptr == 'm') && endptr[1] == '\0') {
LOGE("Port out of range: %ld", value); mul = 1000000;
} else if ((*endptr == 'K' || *endptr == 'k') && endptr[1] == '\0') {
mul = 1000;
} else {
LOGE("Invalid bit-rate unit: %s", optarg);
return -1; return -1;
} }
args->port = (Uint16) value; }
if (value < 0 || ((Uint32) -1) / mul < value) {
LOGE("Bitrate must be positive and less than 2^32: %s", optarg);
return -1;
}
args->bit_rate = (Uint32) value * mul;
break;
}
case 'h': {
args->help = SDL_TRUE;
break; break;
} }
case 'm': { case 'm': {
@ -156,33 +163,26 @@ static int parse_args(struct args *args, int argc, char *argv[]) {
args->max_size = (Uint16) value; args->max_size = (Uint16) value;
break; break;
} }
case 'b': { case 'p': {
char *endptr; char *endptr;
if (*optarg == '\0') { if (*optarg == '\0') {
LOGE("Bit-rate parameter is empty"); LOGE("Invalid port parameter is empty");
return -1; return -1;
} }
long value = strtol(optarg, &endptr, 0); long value = strtol(optarg, &endptr, 0);
int mul = 1;
if (*endptr != '\0') { if (*endptr != '\0') {
if (optarg == endptr) { LOGE("Invalid port: %s", optarg);
LOGE("Invalid bit-rate: %s", optarg);
return -1; return -1;
} }
if ((*endptr == 'M' || *endptr == 'm') && endptr[1] == '\0') { if (value & ~0xffff) {
mul = 1000000; LOGE("Port out of range: %ld", value);
} else if ((*endptr == 'K' || *endptr == 'k') && endptr[1] == '\0') {
mul = 1000;
} else {
LOGE("Invalid bit-rate unit: %s", optarg);
return -1; return -1;
} }
args->port = (Uint16) value;
break;
} }
if (value < 0 || ((Uint32) -1) / mul < value) { case 'v': {
LOGE("Bitrate must be positive and less than 2^32: %s", optarg); args->version = SDL_TRUE;
return -1;
}
args->bit_rate = (Uint32) value * mul;
break; break;
} }
default: default:

Loading…
Cancel
Save