diff options
| author | Joel Bodenmann <joel@unormal.org> | 2014-02-02 12:59:36 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2014-02-02 12:59:36 +0100 |
| commit | 6515373b2a63a24b77ff20a26e9b18468f29a6f9 (patch) | |
| tree | 3defb6803ece269740bef971244ebee5a44173ed /src/gwin | |
| parent | bf8ceb278fc285eff477294e1ae2cf539ada747b (diff) | |
| download | uGFX-6515373b2a63a24b77ff20a26e9b18468f29a6f9.tar.gz uGFX-6515373b2a63a24b77ff20a26e9b18468f29a6f9.tar.bz2 uGFX-6515373b2a63a24b77ff20a26e9b18468f29a6f9.zip | |
removing casts of gfxAlloc() return value as that is the whole idea behind having a void pointer
Diffstat (limited to 'src/gwin')
| -rw-r--r-- | src/gwin/console.c | 2 | ||||
| -rw-r--r-- | src/gwin/gwidget.c | 2 | ||||
| -rw-r--r-- | src/gwin/gwin.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gwin/console.c b/src/gwin/console.c index ef374220..623404be 100644 --- a/src/gwin/console.c +++ b/src/gwin/console.c @@ -285,7 +285,7 @@ GHandle gwinGConsoleCreate(GDisplay *g, GConsoleObject *gc, const GWindowInit *p gcw->bufsize *= gh->height / gdispGetFontMetric(gh->font, fontHeight); // Allocate the buffer - if (!(gcw->buffer = (char*)gfxAlloc(gcw->bufsize))) + if (!(gcw->buffer = gfxAlloc(gcw->bufsize))) return FALSE; // All good! diff --git a/src/gwin/gwidget.c b/src/gwin/gwidget.c index db9dc9fa..484b8c37 100644 --- a/src/gwin/gwidget.c +++ b/src/gwin/gwidget.c @@ -338,7 +338,7 @@ void gwinSetText(GHandle gh, const char *text, bool_t useAlloc) { else if (useAlloc) { char *str; - if ((str = (char *)gfxAlloc(strlen(text)+1))) { + if ((str = gfxAlloc(strlen(text)+1))) { gh->flags |= GWIN_FLG_ALLOCTXT; strcpy(str, text); } diff --git a/src/gwin/gwin.c b/src/gwin/gwin.c index 6b9cb81e..11dcdaf1 100644 --- a/src/gwin/gwin.c +++ b/src/gwin/gwin.c @@ -102,7 +102,7 @@ void _gwinInit(void) { GHandle _gwindowCreate(GDisplay *g, GWindowObject *pgw, const GWindowInit *pInit, const gwinVMT *vmt, uint16_t flags) { // Allocate the structure if necessary if (!pgw) { - if (!(pgw = (GWindowObject *)gfxAlloc(vmt->size))) + if (!(pgw = gfxAlloc(vmt->size))) return 0; pgw->flags = flags|GWIN_FLG_DYNAMIC; } else |