gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2026-08-20 22:04:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor warning diagnostic code to reduce repeated output logic

Browse Source
This commit is contained in:
Rangi
2026-07-04 23:02:16 -04:00
committed by Rangi
parent de36a11be7
commit 6e643406a2
9 changed files with 174 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/extern/getopt.cpp
Vendored
+8 -22
View File
@@ -4,33 +4,19 @@
#include "extern/getopt.hpp"
#include <limits.h>
#include <stdarg.h>
#include <limits.h> // MB_LEN_MAX
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <wchar.h>
#include "style.hpp"
#include "diagnostics.hpp" // errorx
char *musl_optarg;
int musl_optind = 1, musl_optopt;
static int musl_optpos;
[[gnu::format(printf, 1, 2)]]
static void musl_getopt_error(char const *fmt, ...) {
style_Set(stderr, STYLE_RED, true);
fputs("error: ", stderr);
style_Reset(stderr);
va_list args;
va_start(args, fmt);
vfprintf(stderr, fmt, args);
va_end(args);
putc('\n', stderr);
}
static int musl_getopt(int argc, char *argv[], char const *optstring) {
if (!musl_optind) {
musl_optpos = 0;
@@ -96,7 +82,7 @@ static int musl_getopt(int argc, char *argv[], char const *optstring) {
if (d != c || c == ':') {
musl_optopt = c;
if (optstring[0] != ':') {
musl_getopt_error("Unrecognized option '-%s'", optchar);
errorx("Unrecognized option '-%s'", optchar);
}
return '?';
}
@@ -111,7 +97,7 @@ static int musl_getopt(int argc, char *argv[], char const *optstring) {
if (optstring[0] == ':') {
return ':';
}
musl_getopt_error("Missing argument for option '-%s'", optchar);
errorx("Missing argument for option '-%s'", optchar);
return '?';
}
}
@@ -183,7 +169,7 @@ static int
if (colon) {
return '?';
}
musl_getopt_error("Option '--%s' does not take an argument", longopts[i].name);
errorx("Option '--%s' does not take an argument", longopts[i].name);
return '?';
}
musl_optarg = opt + 1;
@@ -194,7 +180,7 @@ static int
if (colon) {
return ':';
}
musl_getopt_error("Missing argument for option '--%s'", longopts[i].name);
errorx("Missing argument for option '--%s'", longopts[i].name);
return '?';
}
++musl_optind;
@@ -209,9 +195,9 @@ static int
musl_optopt = 0;
if (!colon) {
if (cnt) {
musl_getopt_error("Ambiguous option '--%s'", argv[musl_optind] + 2);
errorx("Ambiguous option '--%s'", argv[musl_optind] + 2);
} else {
musl_getopt_error("Unrecognized option '--%s'", argv[musl_optind] + 2);
errorx("Unrecognized option '--%s'", argv[musl_optind] + 2);
}
}
++musl_optind;