X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Ftopblock.c;h=f794b197db2d285c63e0111ccce12e4b8d40c0f6;hp=ef3ca0623206e398a7b2527517e3a69dd36c0252;hb=50be9bb40dc60130c99ffa568e6677779904ff70;hpb=5f1f12f2a37da634000f96d18d59cc73a8814ef7 diff --git a/hacks/glx/topblock.c b/hacks/glx/topblock.c index ef3ca062..f794b197 100644 --- a/hacks/glx/topblock.c +++ b/hacks/glx/topblock.c @@ -189,10 +189,7 @@ init_topBlock (ModeInfo *mi) if (!tbs) { tbs = (topBlockSTATE *) calloc (MI_NUM_SCREENS(mi), sizeof (topBlockSTATE)); - if (!tbs) { - fprintf(stderr, "%s: out of memory\n", progname); - exit(1); - } + if (!tbs) abort(); } tb = &tbs[MI_SCREEN(mi)]; @@ -576,16 +573,18 @@ static void generateNewBlock(ModeInfo *mi) tb->numFallingBlocks++; llTail = tb->blockNodeRoot; if (llTail == NULL) { - if ((llCurrent = ((NODE*) malloc(sizeof(NODE)))) == NULL) { fprintf(stderr, "%s: out of memory.\n", progname); } - llTail = llCurrent; - tb->blockNodeRoot = llCurrent; + llCurrent = ((NODE*) malloc(sizeof(NODE))); + if (!llCurrent) abort(); + llTail = llCurrent; + tb->blockNodeRoot = llCurrent; } else { if (tb->numFallingBlocks>=maxFalling) { /* recycle */ llCurrent=llTail->next; tb->blockNodeRoot=llCurrent->next; } else { - if ((llCurrent = ((NODE*) malloc(sizeof(NODE)))) == NULL) { fprintf(stderr, "%s: out of memory..\n", progname); } + llCurrent = ((NODE*) malloc(sizeof(NODE))); + if (!llCurrent) abort(); } while (llTail->next != NULL) { llTail = llTail->next; } /* find last item in list */ }