Mercurial > molko
changeset 419:1b4e61bdb9ab
core: introduce err.h
author | David Demelier <markand@malikania.fr> |
---|---|
date | Wed, 12 Oct 2022 15:06:18 +0200 |
parents | ed61fef6e47b |
children | 7d2ebc334c8c |
files | GNUmakefile src/libmlk-core/core/err.c src/libmlk-core/core/err.h src/libmlk-core/core/texture.c src/libmlk-core/core/texture.h |
diffstat | 5 files changed, 75 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/GNUmakefile Mon Oct 10 12:34:31 2022 +0200 +++ b/GNUmakefile Wed Oct 12 15:06:18 2022 +0200 @@ -223,6 +223,7 @@ src/libmlk-core/core/core.c \ src/libmlk-core/core/drawable-stack.c \ src/libmlk-core/core/drawable.c \ + src/libmlk-core/core/err.c \ src/libmlk-core/core/error.c \ src/libmlk-core/core/event.c \ src/libmlk-core/core/font.c \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libmlk-core/core/err.c Wed Oct 12 15:06:18 2022 +0200 @@ -0,0 +1,36 @@ +/* + * err.h -- error routines + * + * Copyright (c) 2020-2022 David Demelier <markand@malikania.fr> + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include <SDL.h> + +#include "err.h" + +const char * +mlk_err_string(enum mlk_err e) +{ + switch (e) { + case MLK_ERR_INTERNAL: + return SDL_GetError(); + case MLK_ERR_NO_MEM: + return "out of memory"; + case MLK_ERR_NO_SUPPORT: + return "operation not supported"; + default: + return "no error"; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libmlk-core/core/err.h Wed Oct 12 15:06:18 2022 +0200 @@ -0,0 +1,32 @@ +/* + * err.h -- error handing + * + * Copyright (c) 2020-2022 David Demelier <markand@malikania.fr> + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef MLK_ERR_H +#define MLK_ERR_H + +enum mlk_err { + MLK_ERR_NONE, + MLK_ERR_INTERNAL = -1, + MLK_ERR_NO_MEM = -2, + MLK_ERR_NO_SUPPORT = -3 +}; + +const char * +mlk_err_string(enum mlk_err); + +#endif /* !MLK_ERROR_H */
--- a/src/libmlk-core/core/texture.c Mon Oct 10 12:34:31 2022 +0200 +++ b/src/libmlk-core/core/texture.c Wed Oct 12 15:06:18 2022 +0200 @@ -27,17 +27,19 @@ #include "window.h" #include "window_p.h" -int +enum mlk_err texture_new(struct texture *tex, unsigned int w, unsigned int h) { assert(tex); + assert(w); + assert(h); tex->handle = SDL_CreateTexture(RENDERER(), SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, w, h); if (!tex->handle) { tex->w = tex->h = 0; - return errorf("%s", SDL_GetError()); + return MLK_ERR_INTERNAL; } tex->w = w;
--- a/src/libmlk-core/core/texture.h Mon Oct 10 12:34:31 2022 +0200 +++ b/src/libmlk-core/core/texture.h Wed Oct 12 15:06:18 2022 +0200 @@ -20,6 +20,7 @@ #define MLK_CORE_TEXTURE_H #include "core.h" +#include "err.h" struct texture { unsigned int w; @@ -37,7 +38,7 @@ CORE_BEGIN_DECLS -int +enum mlk_err texture_new(struct texture *, unsigned int, unsigned int); int