gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 10:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor error reporting to simplify BSD-style err (#949)

Browse Source
This commit is contained in:
Rangi
2021-11-21 16:16:54 -05:00
committed by GitHub
parent 54293a9184
commit bdcef6f252
24 changed files with 262 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/error.h Normal file
View File

@@ -0,0 +1,21 @@
/*
* This file is part of RGBDS.
*
* Copyright (c) 1997-2021, RGBDS contributors.
*
* SPDX-License-Identifier: MIT
*/
#ifndef RGBDS_ERROR_H
#define RGBDS_ERROR_H
#include "helpers.h"
#include "platform.h"
void warn(char const NONNULL(fmt), ...) format_(printf, 1, 2);
void warnx(char const NONNULL(fmt), ...) format_(printf, 1, 2);
_Noreturn void err(char const NONNULL(fmt), ...) format_(printf, 1, 2);
_Noreturn void errx(char const NONNULL(fmt), ...) format_(printf, 1, 2);
#endif /* RGBDS_ERROR_H */

44
include/extern/err.h vendored
View File

@@ -1,44 +0,0 @@
/*
* This file is part of RGBDS.
*
* Copyright (c) 1997-2018, RGBDS contributors.
*
* SPDX-License-Identifier: MIT
*/
#ifndef EXTERN_ERR_H
#define EXTERN_ERR_H
#ifdef ERR_IN_LIBC
#include <err.h>
#else /* ERR_IN_LIBC */
#include <stdarg.h>
#include "helpers.h"
#define warn rgbds_warn
#define vwarn rgbds_vwarn
#define warnx rgbds_warnx
#define vwarnx rgbds_vwarnx
#define err rgbds_err
#define verr rgbds_verr
#define errx rgbds_errx
#define verrx rgbds_verrx
void warn(char const *fmt, ...) format_(printf, 1, 2);
void vwarn(char const *fmt, va_list ap) format_(printf, 1, 0);
void warnx(char const *fmt, ...) format_(printf, 1, 2);
void vwarnx(char const *fmt, va_list ap) format_(printf, 1, 0);
_Noreturn void err(int status, char const *fmt, ...) format_(printf, 2, 3);
_Noreturn void verr(int status, char const *fmt, va_list ap) format_(printf, 2, 0);
_Noreturn void errx(int status, char const *fmt, ...) format_(printf, 2, 3);
_Noreturn void verrx(int status, char const *fmt, va_list ap) format_(printf, 2, 0);
#endif /* ERR_IN_LIBC */
#endif /* EXTERN_ERR_H */

2
include/gfx/main.h
View File

@@ -13,7 +13,7 @@
#include <stdbool.h>
#include <stdint.h>
#include "extern/err.h"
#include "error.h"
struct Options {
bool debug;