--
Lee Brown Jr.
[EMAIL PROTECTED]
___________________________________________________________
diff -r degas-old/lib/libggi/default/ramdac/visual.c
degas/lib/libggi/default/ramdac/visual.c
51c51,53
< vis->palette=_ggi_malloc(256*sizeof(ggi_color));
---
> vis->palette=malloc(256*sizeof(ggi_color));
> if(vis == NULL)
> return GGI_ENOMEM;
diff -r degas-old/lib/libggi/display/X/mode.inc degas/lib/libggi/display/X/mode.inc
534c534
< void *fbaddr = _ggi_malloc((tm->virt.x * tm->virt.y
---
> void *fbaddr = malloc((tm->virt.x * tm->virt.y
536a537,541
> if(fbaddr == NULL){
> /* FIXME need to XDestroyImage ? */
> ggUnlock(priv->xwin.x.xliblock);
> return GGI_ENOMEM;
> }
636c641
< vis->palette = _ggi_malloc(sizeof(ggi_color)
---
> vis->palette = malloc(sizeof(ggi_color)
637a643,647
> if(vis->palette == NULL){
> /* FIXME Need to XDestroyImage */
> ggUnlock(priv->xwin.x.xliblock);
> return GGI_ENOMEM;
> }
639d648
<
diff -r degas-old/lib/libggi/display/X/visual.c degas/lib/libggi/display/X/visual.c
143c143
< int err, i;
---
> int err, i, retval;
165c165,169
< priv = _ggi_malloc(sizeof(ggi_x_priv));
---
> priv = malloc(sizeof(ggi_x_priv));
> if(priv == NULL){
> retval = GGI_ENOMEM;
> goto unlock;
> }
203c207,211
< priv->opmansync = _ggi_malloc(sizeof(_ggi_opmansync));
---
> priv->opmansync = malloc(sizeof(_ggi_opmansync));
> if(priv->opmansync == NULL){
> retval = GGI_ENOMEM;
> goto freepriv;
> }
271c279,283
< LIBGGI_GC(vis) = _ggi_malloc(sizeof(ggi_gc));
---
> LIBGGI_GC(vis) = malloc(sizeof(ggi_gc));
> if(LIBGGI_GC(vis) == NULL){
> retval = GGI_ENOMEM;
> goto freeopmansync;
> }
276a289,300
>
> freeopmansync:
> free(priv->opmansync);
>
> freepriv:
> free(priv);
>
> unlock:
> ggLockDestroy(lock);
> XCloseDisplay(disp);
>
> return retval;
diff -r degas-old/lib/libggi/display/Xlib/visual.c
degas/lib/libggi/display/Xlib/visual.c
128c128,133
< priv = _ggi_malloc(sizeof(ggi_xlib_priv));
---
> priv = malloc(sizeof(ggi_xlib_priv));
> if(priv == NULL){
> ggLockDestroy(lock);
> XCloseDisplay(disp);
> return GGI_ENOMEM;
> }
216c221,227
< LIBGGI_GC(vis) = _ggi_malloc(sizeof(ggi_gc));
---
> LIBGGI_GC(vis) = malloc(sizeof(ggi_gc));
> if(LIBGGI_GC(vis) == NULL){
> free(priv);
> ggLockDestroy(lock);
> XCloseDisplay(disp);
> return GGI_ENOMEM;
> }
Only in degas-old/lib/libggi/display/aa: Makefile
diff -r degas-old/lib/libggi/display/aa/mode.c degas/lib/libggi/display/aa/mode.c
68,69c68,72
< if(!vis->palette)
< vis->palette = _ggi_malloc(256*sizeof(ggi_color));
---
> if(!vis->palette){
> vis->palette = malloc(256*sizeof(ggi_color));
> if(vis->palette == NULL)
> return GGI_ENOMEM;
> }
diff -r degas-old/lib/libggi/display/aa/visual.c degas/lib/libggi/display/aa/visual.c
72c72
< int err;
---
> int err, retval;
82c82,87
< priv = _ggi_malloc(sizeof(ggi_aa_priv));
---
> priv = malloc(sizeof(ggi_aa_priv));
> if(priv == NULL){
> retval = GGI_ENOMEM;
> goto unlock;
> }
>
91c96,99
< priv->opmansync = _ggi_malloc(sizeof(_ggi_opmansync));
---
> priv->opmansync = malloc(sizeof(_ggi_opmansync));
> if(priv->opmansync == NULL){
> retval = GGI_ENOMEM;
> goto freepriv;
122c130,134
< LIBGGI_GC(vis) = _ggi_malloc(sizeof(ggi_gc));
---
> LIBGGI_GC(vis) = malloc(sizeof(ggi_gc));
> if(LIBGGI_GC(vis) == NULL){
> retval = GGI_ENOMEM;
> goto freeopman;
> }
168a181,191
>
> freeopman:
> free(priv->opmansync);
>
> freepriv:
> free(priv);
>
> unlock:
> ggLockDestroy(lock);
>
> return retval;
diff -r degas-old/lib/libggi/display/fbdev/mode.c degas/lib/libggi/display/fbdev/mode.c
543a544,561
> /* Set up palette */
> if (vis->palette) {
> free(vis->palette);
> vis->palette = NULL;
> }
> gt = LIBGGI_GT(vis);
> if ((GT_SCHEME(gt) == GT_PALETTE) || (GT_SCHEME(gt) == GT_TEXT)) {
> int nocols = 1 << GT_DEPTH(gt);
>
> vis->palette = malloc(nocols * sizeof(ggi_color));
> if(vis->palette == NULL)
> return GGI_ENOMEM;
>
> vis->opcolor->setpalvec = GGI_fbdev_setpalvec;
> /* Initialize palette */
> ggiSetColorfulPalette(vis);
> }
>
551a570
> free(vis->palette);
568,582d586
< /* Set up palette */
< if (vis->palette) {
< free(vis->palette);
< vis->palette = NULL;
< }
< gt = LIBGGI_GT(vis);
< if ((GT_SCHEME(gt) == GT_PALETTE) || (GT_SCHEME(gt) == GT_TEXT)) {
< int nocols = 1 << GT_DEPTH(gt);
<
< vis->palette = _ggi_malloc(nocols * sizeof(ggi_color));
< vis->opcolor->setpalvec = GGI_fbdev_setpalvec;
< /* Initialize palette */
< ggiSetColorfulPalette(vis);
< }
<
diff -r degas-old/lib/libggi/display/file/mode.c degas/lib/libggi/display/file/mode.c
181a182,187
> /* Set up palette */
> if (vis->palette) {
> free(vis->palette);
> vis->palette = NULL;
> }
>
184c190,195
< } else {
---
> vis->palette = malloc(sizeof(ggi_color) * priv->num_cols);
> if(vis->palette == NULL){
> return GGI_ENOMEM;
> }
> }
> else {
199a211
> free(vis->palette);
206a219
> free(vis->palette);
227,235d239
< /* Set up palette */
< if (vis->palette) {
< free(vis->palette);
< vis->palette = NULL;
< }
< if (GT_SCHEME(gt) == GT_PALETTE) {
< vis->palette = _ggi_malloc(sizeof(ggi_color) * priv->num_cols);
< }
<
diff -r degas-old/lib/libggi/display/file/visual.c
degas/lib/libggi/display/file/visual.c
70,71c70,78
< LIBGGI_PRIVATE(vis) = priv = _ggi_malloc(sizeof(ggi_file_priv));
< LIBGGI_GC(vis) = _ggi_malloc(sizeof(ggi_gc));
---
> LIBGGI_PRIVATE(vis) = priv = malloc(sizeof(ggi_file_priv));
> if(priv == NULL)
> return GGI_ENOMEM;
>
> LIBGGI_GC(vis) = malloc(sizeof(ggi_gc));
> if(LIBGGI_GC(vis) == NULL){
> free(priv);
> return GGI_ENOMEM;
> }
Only in degas-old/lib/libggi/display/glide: Makefile
diff -r degas-old/lib/libggi/display/glide/box.c degas/lib/libggi/display/glide/box.c
135c135,137
< chunkbuf = _ggi_malloc(w*h*priv->bytes_per_pixel);
---
> chunkbuf = malloc(w*h*priv->bytes_per_pixel);
> if(chunkbuf == NULL)
> return GGI_ENOMEM;
Only in degas-old/lib/libggi/display/lcd823: Makefile
diff -r degas-old/lib/libggi/display/lcd823/mode.c
degas/lib/libggi/display/lcd823/mode.c
154c154,158
< vis->palette = _ggi_malloc(nocols * sizeof(ggi_color));
---
> vis->palette = malloc(nocols * sizeof(ggi_color));
> if(vis->palette == NULL){
> return GGI_ENOMEM;
> }
>
diff -r degas-old/lib/libggi/display/mansync/alarm.c
degas/lib/libggi/display/mansync/alarm.c
178c178,181
< vis->helperpriv = _ggi_malloc(sizeof(struct mansync_hook));
---
> vis->helperpriv = malloc(sizeof(struct mansync_hook));
> if(vis->helperpriv == NULL)
> return GGI_ENOMEM;
>
diff -r degas-old/lib/libggi/display/mansync/child.c
degas/lib/libggi/display/mansync/child.c
246c246,249
< vis->helperpriv = _ggi_malloc(sizeof(struct mansync_hook));
---
> vis->helperpriv = malloc(sizeof(struct mansync_hook));
> if(vis->helperpriv == NULL)
> return GGI_ENOMEM;
>
253,254c256,260
< _GGI_mansync_state.visuals = _ggi_realloc(
< _GGI_mansync_state.visuals, sizeof(ggi_visual*)*nrvisuals);
---
> _GGI_mansync_state.visuals = realloc(_GGI_mansync_state.visuals,
>sizeof(ggi_visual*)*nrvisuals);
> if(_GGI_mansync_state.visuals == NULL){
> free(vis->helperpriv);
> return GGI_ENOMEM;
> }
279,281c285,288
< _GGI_mansync_state.visuals = _ggi_realloc(
< _GGI_mansync_state.visuals,
< sizeof(ggi_visual*) * (nrvisuals-1));
---
> _GGI_mansync_state.visuals =
>
>realloc(_GGI_mansync_state.visuals,sizeof(ggi_visual*) * (nrvisuals-1));
> if(_GGI_mansync_state.visuals == NULL)
> return GGI_ENOMEM;
diff -r degas-old/lib/libggi/display/mansync/pthread.c
degas/lib/libggi/display/mansync/pthread.c
85c85,88
< vis->helperpriv = _ggi_malloc(sizeof(struct mansync_hook));
---
> vis->helperpriv = malloc(sizeof(struct mansync_hook));
> if(vis->helperpriv == NULL)
> return GGI_ENOMEM;
>
diff -r degas-old/lib/libggi/display/memory/mode.c
degas/lib/libggi/display/memory/mode.c
95,96c95,97
< vis->palette = _ggi_malloc((1 << GT_DEPTH(LIBGGI_GT(vis)))*
< sizeof(ggi_color));
---
> vis->palette = malloc((1 <<
>GT_DEPTH(LIBGGI_GT(vis)))*sizeof(ggi_color));
> if(vis->palette == NULL)
> return GGI_ENOMEM;
diff -r degas-old/lib/libggi/display/monotext/mode.c
degas/lib/libggi/display/monotext/mode.c
114,115c114,116
< vis->palette = _ggi_malloc((1 << GT_DEPTH(LIBGGI_GT(vis)))*
< sizeof(ggi_color));
---
> vis->palette = malloc((1 <<
>GT_DEPTH(LIBGGI_GT(vis)))*sizeof(ggi_color));
> if(vis->palette == NULL)
> return GGI_ENOMEM;
161c162,164
< priv->mem_opdraw = _ggi_malloc(sizeof(struct ggi_visual_opdraw));
---
> priv->mem_opdraw = malloc(sizeof(struct ggi_visual_opdraw));
> if(priv->mem_opdraw == NULL)
> return GGI_ENOMEM;
diff -r degas-old/lib/libggi/display/monotext/monotext.c
degas/lib/libggi/display/monotext/monotext.c
445,447c445,460
< priv->colormap = _ggi_malloc(256 * sizeof(ggi_color));
< priv->greymap = _ggi_malloc(256);
< priv->rgb_to_grey = _ggi_malloc(32 * 32 * 32);
---
> priv->colormap = malloc(256 * sizeof(ggi_color));
> if(priv->colormap == NULL)
> return GGI_ENOMEM;
>
> priv->greymap = malloc(256);
> if(priv->greymap == NULL){
> free(priv->colormap);
> return GGI_ENOMEM;
> }
>
> priv->rgb_to_grey = malloc(32 * 32 * 32);
> if(priv->rgb_to_grey == NULL){
> free(priv->colormap);
> free(priv->greymap);
> return GGI_ENOMEM;
> }
diff -r degas-old/lib/libggi/display/multi/visual.c
degas/lib/libggi/display/multi/visual.c
44a45,46
> MultiVis *cur, *temp;
> int retval;
51c53,55
< LIBGGI_PRIVATE(vis) = mm = _ggi_malloc(sizeof(ggi_multi_priv));
---
> LIBGGI_PRIVATE(vis) = mm = malloc(sizeof(ggi_multi_priv));
> if(mm == NULL)
> return GGI_ENOMEM;
57d60
< MultiVis *cur;
71c74,76
< cur = _ggi_malloc(sizeof(MultiVis));
---
> cur = malloc(sizeof(MultiVis));
> if(cur == NULL)
> continue;
81,82c86,87
< free(cur); free(mm);
< return GGI_ENODEVICE;
---
> free(cur);
> continue;
108,109c113,114
< free(mm);
< return GGI_EARGINVAL;
---
> retval = GGI_EARGINVAL;
> goto freemm;
115c120,124
< LIBGGI_GC(vis) = _ggi_malloc(sizeof(ggi_gc));
---
> LIBGGI_GC(vis) = malloc(sizeof(ggi_gc));
> if(LIBGGI_GC(vis) == NULL){
> retval = GGI_ENOMEM;
> goto freemm;
> }
169a179,189
>
> freemm:
> cur = mm->vis_list;
> while(cur != NULL){
> temp = cur->next;
> free(cur);
> cur = temp;
> }
> free(mm);
>
> return retval;
diff -r degas-old/lib/libggi/display/palemu/mode.c
degas/lib/libggi/display/palemu/mode.c
81a82,93
> /* Set up palette */
> if (vis->palette) {
> free(vis->palette);
> vis->palette = NULL;
> }
> if (GT_SCHEME(LIBGGI_GT(vis)) == GT_PALETTE) {
> vis->palette = malloc((1 << GT_DEPTH(LIBGGI_GT(vis))) *
>sizeof(ggi_color));
> if(vis->palette == NULL)
> return GGI_ENOMEM;
> }
>
>
86,87c98
<
< GGIDPRINT_MODE("display-palemu: fb=%p size=%d frame=%d\n",
---
> GGIDPRINT_MODE("display-palemu: fb=%p size=%d frame=%d\n",
89d99
<
90a101
> free(vis->palette);
122,131d132
< /* Set up palette */
< if (vis->palette) {
< free(vis->palette);
< vis->palette = NULL;
< }
< if (GT_SCHEME(LIBGGI_GT(vis)) == GT_PALETTE) {
< vis->palette = _ggi_malloc((1 << GT_DEPTH(LIBGGI_GT(vis))) *
< sizeof(ggi_color));
< }
<
171c172,176
< priv->mem_opdraw = _ggi_malloc(sizeof(struct ggi_visual_opdraw));
---
> priv->mem_opdraw = malloc(sizeof(struct ggi_visual_opdraw));
> if(priv->mem_opdraw == NULL){
> _GGI_palemu_freedbs(vis);
> return GGI_ENOMEM;
> }
diff -r degas-old/lib/libggi/display/palemu/palemu.c
degas/lib/libggi/display/palemu/palemu.c
166a167,177
> priv->palette = malloc(256 * sizeof(ggi_color));
> if(priv->palette == NULL)
> return GGI_ENOMEM;
>
> priv->lookup = malloc(256 * sizeof(ggi_pixel));
> if(priv->lookup == NULL){
> free(priv->palette);
> return GGI_ENOMEM;
> }
>
>
171a183,184
> free(priv->palette);
> free(priv->lookup);
203,204d215
< priv->palette = _ggi_malloc(256 * sizeof(ggi_color));
< priv->lookup = _ggi_malloc(256 * sizeof(ggi_pixel));
diff -r degas-old/lib/libggi/display/palemu/visual.c
degas/lib/libggi/display/palemu/visual.c
63c63,65
< LIBGGI_PRIVATE(vis) = priv = _ggi_malloc(sizeof(ggi_palemu_priv));
---
> LIBGGI_PRIVATE(vis) = priv = malloc(sizeof(ggi_palemu_priv));
> if(priv == NULL)
> return GGI_ENOMEM;
70,71c72,83
< vis->gc = _ggi_malloc(sizeof(ggi_gc));
< priv->opmansync = _ggi_malloc(sizeof(_ggi_opmansync));
---
> vis->gc = malloc(sizeof(ggi_gc));
> if(vis->gc == NULL){
> ggLockDestroy(priv->flush_lock);
> free(priv);
> }
>
> priv->opmansync = malloc(sizeof(_ggi_opmansync));
> if(priv->opmansync == NULL){
> free(vis->gc);
> ggLockDestroy(priv->flush_lock);
> free(priv);
> }
80,84c92,96
< if (ggParseOptions(getenv("GGI_PALEMU_OPTIONS"),
< options, NUM_OPTS) == NULL) {
<
< fprintf(stderr, "display-palemu: error in "
< "$GGI_PALEMU_OPTIONS.\n");
---
> if(ggParseOptions(getenv("GGI_PALEMU_OPTIONS"),options, NUM_OPTS) ==
>NULL) {
> fprintf(stderr, "display-palemu: error in
>""$GGI_PALEMU_OPTIONS.\n");
> free(priv->opmansync);
> free(vis->gc);
> ggLockDestroy(priv->flush_lock);
95a108,110
> free(priv->opmansync);
> free(vis->gc);
> ggLockDestroy(priv->flush_lock);
110a126,129
> free(priv->opmansync);
> free(vis->gc);
> ggLockDestroy(priv->flush_lock);
> free(priv);
128a148,150
> free(priv->opmansync);
> free(vis->gc);
> ggLockDestroy(priv->flush_lock);
142a165,167
> free(priv->opmansync);
> free(vis->gc);
> ggLockDestroy(priv->flush_lock);
Only in degas/lib/libggi/display/suidkgi: .deps
diff -r degas-old/lib/libggi/display/suidkgi/visual.c
degas/lib/libggi/display/suidkgi/visual.c
78c78,80
< shark = LIBGGI_PRIVATE(vis) = _ggi_malloc(sizeof(suid_hook));
---
> shark = LIBGGI_PRIVATE(vis) = malloc(sizeof(suid_hook));
> if(shark == NULL)
> return GGI_ENOMEM;
80c82,86
< LIBGGI_GC(vis) = _ggi_malloc(sizeof(ggi_gc));
---
> LIBGGI_GC(vis) = malloc(sizeof(ggi_gc));
> if(LIBGGI(vis) == NULL){
> free(shark);
> return GGI_ENOMEM;
> }
90d95
< /* close(LIBGGI_FD(vis));
92c97
< return GGI_ENODEVICE; PUT ME BACK IN ! TESTING ! */
---
> return GGI_ENODEVICE;
104,105c109,123
< vis->w_frame=malloc(sizeof(ggi_directbuffer)); /* FIXME ! */
< vis->r_frame=malloc(sizeof(ggi_directbuffer)); /* FIXME ! */
---
> vis->w_frame=malloc(sizeof(ggi_directbuffer));
> if(vis->w_frame == NULL){
> giiClose(vis->input);
> free(shark);
> return GGI_ENOMEM;
> }
>
> vis->r_frame=malloc(sizeof(ggi_directbuffer));
> if(vis->r_frame == NULL){
> free(vis->w_frame);
> giiClose(vis->input);
> free(shark);
> return GGI_ENOMEM;
> }
>
diff -r degas-old/lib/libggi/display/tele/mode.c degas/lib/libggi/display/tele/mode.c
92a93,101
> /* set up palette */
> if (GT_SCHEME(LIBGGI_GT(vis)) == GT_PALETTE) {
> vis->palette = malloc((1 <<
>GT_DEPTH(LIBGGI_GT(vis)))*sizeof(ggi_color));
> if(vis->palette == NULL)
> return GGI_ENOMEM;
>
> vis->opcolor->setpalvec = GGI_tele_setpalvec;
> }
>
121,126d129
< /* set up palette */
< if (GT_SCHEME(LIBGGI_GT(vis)) == GT_PALETTE) {
< vis->palette = _ggi_malloc((1 << GT_DEPTH(LIBGGI_GT(vis)))*
< sizeof(ggi_color));
< vis->opcolor->setpalvec = GGI_tele_setpalvec;
< }
diff -r degas-old/lib/libggi/display/tele/visual.c
degas/lib/libggi/display/tele/visual.c
45c45,53
< LIBGGI_PRIVATE(vis) = priv = _ggi_malloc(sizeof(ggi_tele_priv));
---
> LIBGGI_PRIVATE(vis) = priv = malloc(sizeof(ggi_tele_priv));
> if(priv == NULL)
> return GGI_ENOMEM;
>
> priv->client = malloc(sizeof(TeleClient));
> if(priv->client == NULL){
> free(priv);
> return GGI_ENOMEM;
> }
47d54
< priv->client = _ggi_malloc(sizeof(TeleClient));
52c59,64
< vis->gc = _ggi_malloc(sizeof(ggi_gc));
---
> vis->gc = malloc(sizeof(ggi_gc));
> if(vis->gc == NULL){
> free(priv->client);
> free(priv);
> return GGI_ENOMEM;
> }
diff -r degas-old/lib/libggi/display/terminfo/mode.c
degas/lib/libggi/display/terminfo/mode.c
183c183
< int status;
---
> int status, index;
210c210
< _ggi_db_add_buffer(LIBGGI_PRIVLIST(vis), _ggi_db_get_new());
---
> index = _ggi_db_add_buffer(LIBGGI_PRIVLIST(vis), _ggi_db_get_new());
213,214c213,218
< LIBGGI_PRIVBUFS(vis)[0]->read =
< LIBGGI_PRIVBUFS(vis)[0]->write = _ggi_malloc(LIBGGI_FB_SIZE(tm));
---
> LIBGGI_PRIVBUFS(vis)[0]->read = LIBGGI_PRIVBUFS(vis)[0]->write =
>malloc(LIBGGI_FB_SIZE(tm));
> if(LIBGGI_PRIVBUFS(vis)[0]->write == NULL){
> _ggi_db_del_buffer(LIBGGI_PRIVLIST(vis), index);
> return GGI_ENOMEM;
> }
>
diff -r degas-old/lib/libggi/display/terminfo/visual.c
degas/lib/libggi/display/terminfo/visual.c
202c202,204
< tiinfo = (struct TIhooks *)_ggi_malloc(sizeof(struct TIhooks));
---
> tiinfo = (struct TIhooks *)malloc(sizeof(struct TIhooks));
> if(tiinfo == NULL)
> return GGI_ENOMEM;
274c276,282
< LIBGGI_GC(vis) = _ggi_malloc(sizeof(ggi_gc));
---
> LIBGGI_GC(vis) = malloc(sizeof(ggi_gc));
> if(LIBGGI_GC(vis) == NULL){
> fclose(tiinfo->f_in);
> fclose(tiinfo->f_out);
> free(tiinfo);
> return GGI_ENOMEM;
> }
diff -r degas-old/lib/libggi/display/tile/stubs.c degas/lib/libggi/display/tile/stubs.c
248,249c248,251
< priv->buf = _ggi_malloc(
< (LIBGGI_PIXFMT(vis)->size+7)/8*width*height);
---
> priv->buf = malloc((LIBGGI_PIXFMT(vis)->size+7)/8*width*height);
> if(priv->buf == NULL)
> return GGI_ENOMEM;
>
diff -r degas-old/lib/libggi/display/tile/visual.c
degas/lib/libggi/display/tile/visual.c
67c67,69
< LIBGGI_GC(vis) = _ggi_malloc(sizeof(ggi_gc));
---
> LIBGGI_GC(vis) = malloc(sizeof(ggi_gc));
> if(LIBGGI_GC(vis) == NULL)
> return GGI_ENOMEM;
69,70c71,82
< LIBGGI_PRIVATE(vis) = priv = _ggi_malloc(sizeof(ggi_tile_priv));
< priv->opmansync = _ggi_malloc(sizeof(_ggi_opmansync));
---
> LIBGGI_PRIVATE(vis) = priv = malloc(sizeof(ggi_tile_priv));
> if(priv == NULL){
> free(LIBGGI_GC(vis));
> return GGI_ENOMEM;
> }
>
> priv->opmansync = malloc(sizeof(_ggi_opmansync));
> if(priv->opmansync == NULL){
> free(priv);
> free(LIBGGI_GC(vis));
> return GGI_ENOMEM;
> }
diff -r degas-old/lib/libggi/display/trueemu/mode.c
degas/lib/libggi/display/trueemu/mode.c
126a127,131
> /* do this now in case it fails */
> priv->mem_opdraw = malloc(sizeof(struct ggi_visual_opdraw));
> if(priv->mem_opdraw == NULL)
> return GGI_ENOMEM;
>
129a135
> free(priv->mem_opdraw);
138a145
> free(priv->mem_opdraw);
149d155
< priv->mem_opdraw = _ggi_malloc(sizeof(struct ggi_visual_opdraw));
diff -r degas-old/lib/libggi/display/trueemu/trueemu.c
degas/lib/libggi/display/trueemu/trueemu.c
428,430c428,436
< priv->R = _ggi_malloc(256 * 4 * 2);
< priv->G = _ggi_malloc(256 * 4 * 2);
< priv->B = _ggi_malloc(256 * 4 * 2);
---
> priv->R = malloc(256 * 4 * 2);
> if(priv->R == NULL)
> ggiPanic("Out of memory in truuemu lookup table alloc\n");
> priv->G = malloc(256 * 4 * 2);
> if(priv->G == NULL)
> ggiPanic("Out of memory in truuemu lookup table alloc\n");
> priv->B = malloc(256 * 4 * 2);
> if(priv->B == NULL)
> ggiPanic("Out of memory in truuemu lookup table alloc\n");
463,465c469,479
< priv->R = _ggi_malloc(256 * 4 * 2);
< priv->G = _ggi_malloc(256 * 4 * 2);
< priv->B = _ggi_malloc(256 * 4 * 2);
---
> priv->R = malloc(256 * 4 * 2);
> if(priv->R == NULL)
> ggiPanic("Out of memory in truuemu lookup table alloc\n");
>
> priv->G = malloc(256 * 4 * 2);
> if(priv->G == NULL)
> ggiPanic("Out of memory in truuemu lookup table alloc\n");
>
> priv->B = malloc(256 * 4 * 2);
> if(priv->B == NULL)
> ggiPanic("Out of memory in truuemu lookup table alloc\n");
496c510,512
< priv->T = _ggi_malloc(32768 * 4);
---
> priv->T = malloc(32768 * 4);
> if(priv->T == NULL)
> ggiPanic("Out of memory in truuemu lookup table alloc\n");
527c543,545
< priv->T = _ggi_malloc(32768 * 4);
---
> priv->T = malloc(32768 * 4);
> if(priv->T == NULL)
> ggiPanic("Out of memory in truuemu lookup table alloc\n");
560c578,580
< priv->T = _ggi_malloc(32768 * 4);
---
> priv->T = malloc(32768 * 4);
> if(priv->T == NULL)
> ggiPanic("Out of memory in truuemu lookup table alloc\n");
603c623,625
< priv->T = _ggi_malloc(32768 * 4);
---
> priv->T = malloc(32768 * 4);
> if(priv->T == NULL)
> ggiPanic("Out of memory in truuemu lookup table alloc\n");
690c712,714
< priv->T = _ggi_malloc(32768 * 4);
---
> priv->T = malloc(32768 * 4);
> if(priv->T == NULL)
> ggiPanic("Out of memory in truuemu lookup table alloc\n");
721c745,747
< priv->T = _ggi_malloc(32768 * 4);
---
> priv->T = malloc(32768 * 4)
> if(priv->T == NULL)
> ggiPanic("Out of memory in truuemu lookup table alloc\n");;
942,943c968,976
< priv->src_buf = _ggi_malloc(bufsize);
< priv->dest_buf = _ggi_malloc(bufsize);
---
> priv->src_buf = malloc(bufsize);
> if(priv->src_buf == NULL)
> return GGI_ENOMEM;
>
> priv->dest_buf = malloc(bufsize);
> if(priv->dest_buf == NULL){
> free(priv->src_buf);
> return GGI_ENOMEM;
> }
diff -r degas-old/lib/libggi/display/trueemu/visual.c
degas/lib/libggi/display/trueemu/visual.c
67c67
< priv = LIBGGI_PRIVATE(vis) = _ggi_malloc(sizeof(ggi_trueemu_priv));
---
> priv = LIBGGI_PRIVATE(vis) = malloc(sizeof(ggi_trueemu_priv));
74,75c74,87
< vis->gc = _ggi_malloc(sizeof(ggi_gc));
< priv->opmansync = _ggi_malloc(sizeof(_ggi_opmansync));
---
> vis->gc = malloc(sizeof(ggi_gc));
> if(vis->gc == NULL){
> ggLockDestroy(priv->flush_lock);
> free(priv);
> return GGI_ENOMEM;
> }
>
> priv->opmansync = malloc(sizeof(_ggi_opmansync));
> if(priv->opmansync == NULL){
> free(vis->gc);
> ggLockDestroy(priv->flush_lock);
> free(priv);
> return GGI_ENOMEM;
> }
diff -r degas-old/lib/libggi/display/vcsa/visual.c
degas/lib/libggi/display/vcsa/visual.c
103a104,114
> priv = LIBGGI_PRIVATE(vis) = malloc(sizeof(ggi_vcsa_priv));
> if(priv == NULL)
> return GGI_ENOMEM;
>
> LIBGGI_GC(vis) = malloc(sizeof(ggi_gc));
> if(priv == NULL){
> free(priv);
> return GGI_ENOMEM;
> }
>
>
110a122,123
> free(priv);
> free(LIBGGI_GC(vis));
120a134,135
> free(priv);
> free(LIBGGI_GC(vis));
139a155,156
> free(priv);
> free(LIBGGI_GC(vis));
157a175,176
> free(priv);
> free(LIBGGI_GC(vis));
165a185,186
> free(priv);
> free(LIBGGI_GC(vis));
169d189
< priv = LIBGGI_PRIVATE(vis) = _ggi_malloc(sizeof(ggi_vcsa_priv));
207a228
> free(LIBGGI_GC(vis));
218,219d238
< LIBGGI_GC(vis) = _ggi_malloc(sizeof(ggi_gc));
<
diff -r degas-old/lib/libggi/display/xf86dga/mode.c
degas/lib/libggi/display/xf86dga/mode.c
253c253,255
< vis->palette = _ggi_malloc(sizeof(ggi_color) * priv->x.nocols);
---
> vis->palette = malloc(sizeof(ggi_color) * priv->x.nocols);
> if(vis->palette == NULL)
> return GGI_ENOMEM;
271c273,276
< if (res == NULL) return GGI_EFATAL;
---
> if (res == NULL){
> free(vis->palette);
> return GGI_EFATAL;
> }
333a339
> free(vis->palette);
diff -r degas-old/lib/libggi/display/xf86dga/visual.c
degas/lib/libggi/display/xf86dga/visual.c
187c187,191
< priv = _ggi_malloc(sizeof(ggidga_priv));
---
> priv = malloc(sizeof(ggidga_priv));
> if(priv == NULL){
> XCloseDisplay(disp);
> return GGI_ENOMEM;
> }
241c245,251
< priv->modes = _ggi_malloc((priv->num_modes+1)*sizeof(ggi_modelistmode));
---
> priv->modes = malloc((priv->num_modes+1)*sizeof(ggi_modelistmode));
> if(priv->modes == NULL){
> _ggi_XF86DGAUnmap();
> XCloseDisplay(disp);
> free(priv);
> return GGI_ENOMEM;
> }
258c268,275
< LIBGGI_GC(vis) = _ggi_malloc(sizeof(ggi_gc));
---
> LIBGGI_GC(vis) = malloc(sizeof(ggi_gc));
> if(LIBGGI_GC(vis) == NULL){
> free(priv->modes);
> _ggi_XF86DGAUnmap();
> XCloseDisplay(disp);
> free(priv);
> return GGI_ENOMEM;
> }
diff -r degas-old/lib/libggi/ggi/EXPSYMS degas/lib/libggi/ggi/EXPSYMS
16d15
< _ggi_calloc
26d24
< _ggi_malloc
29d26
< _ggi_realloc
diff -r degas-old/lib/libggi/ggi/db.c degas/lib/libggi/ggi/db.c
76c76,79
< dbl->bufs = _ggi_realloc(dbl->bufs, sizeof(ggi_directbuffer *) * dbl->num);
---
> dbl->bufs = realloc(dbl->bufs, sizeof(ggi_directbuffer *) * dbl->num);
> if(dbl->bufs == NULL)
> ggiPanic("Out of memory in _ggidb_add_buffer ");
>
98c101,103
< dbl->bufs = _ggi_realloc(dbl->bufs, sizeof(ggi_directbuffer *) *
dbl->num);
---
> dbl->bufs = realloc(dbl->bufs, sizeof(ggi_directbuffer *) * dbl->num);
> if(dbl->bufs == NULL)
> ggiPanic("Out of memory in _ggidb_del_buffer ");
diff -r degas-old/lib/libggi/ggi/dl.c degas/lib/libggi/ggi/dl.c
133c133,140
< tmp = (ggi_dlhandle_l *)_ggi_malloc(sizeof(ggi_dlhandle_l));
---
> tmp = (ggi_dlhandle_l *)malloc(sizeof(ggi_dlhandle_l));
> if(tmp == NULL){
> dlh->close(vis, dlh);
> ggFreeModule(dlh->handle);
> free(dlh);
> return NULL;
> }
>
138c145,149
< tmp = (ggi_dlhandle_l *)_ggi_malloc(sizeof(ggi_dlhandle_l));
---
> tmp = (ggi_dlhandle_l *)malloc(sizeof(ggi_dlhandle_l));
> if(tmp == NULL){
> return NULL;
> }
>
184,188c195,201
< tmp = (ggi_dlhandle_l *)_ggi_malloc(sizeof(ggi_dlhandle_l));
< tmp->handle = dlh;
< tmp->next = vis->opdisplay->head.dlhandle;
< vis->opdisplay->head.dlhandle = tmp;
< dlh->usecnt++;
---
> tmp = (ggi_dlhandle_l *)malloc(sizeof(ggi_dlhandle_l));
> if(tmp != NULL){
> tmp->handle = dlh;
> tmp->next = vis->opdisplay->head.dlhandle;
> vis->opdisplay->head.dlhandle = tmp;
> dlh->usecnt++;
> }
192,196c205,211
< tmp = _ggi_malloc(sizeof(ggi_dlhandle_l));
< tmp->handle = dlh;
< tmp->next = vis->opcolor->head.dlhandle;
< vis->opcolor->head.dlhandle = tmp;
< dlh->usecnt++;
---
> tmp = malloc(sizeof(ggi_dlhandle_l));
> if(tmp != NULL){
> tmp->handle = dlh;
> tmp->next = vis->opcolor->head.dlhandle;
> vis->opcolor->head.dlhandle = tmp;
> dlh->usecnt++;
> }
200,204c215,221
< tmp = _ggi_malloc(sizeof(ggi_dlhandle_l));
< tmp->handle = dlh;
< tmp->next = vis->opdraw->head.dlhandle;
< vis->opdraw->head.dlhandle = tmp;
< dlh->usecnt++;
---
> tmp = malloc(sizeof(ggi_dlhandle_l));
> if(tmp != NULL){
> tmp->handle = dlh;
> tmp->next = vis->opdraw->head.dlhandle;
> vis->opdraw->head.dlhandle = tmp;
> dlh->usecnt++;
> }
208,212c225,231
< tmp = _ggi_malloc(sizeof(ggi_dlhandle_l));
< tmp->handle = dlh;
< tmp->next = vis->opgc->head.dlhandle;
< vis->opgc->head.dlhandle = tmp;
< dlh->usecnt++;
---
> tmp = malloc(sizeof(ggi_dlhandle_l));
> if(tmp != NULL){
> tmp->handle = dlh;
> tmp->next = vis->opgc->head.dlhandle;
> vis->opgc->head.dlhandle = tmp;
> dlh->usecnt++;
> }
215,219c234,240
< dlh->usecnt = 1;
< tmp = _ggi_malloc(sizeof(ggi_dlhandle_l));
< tmp->handle = dlh;
< tmp->next = vis->extlib;
< vis->extlib = tmp;
---
> tmp = malloc(sizeof(ggi_dlhandle_l));
> if(tmp != NULL){
> dlh->usecnt = 1;
> tmp->handle = dlh;
> tmp->next = vis->extlib;
> vis->extlib = tmp;
> }
230c251,254
< tmp = (ggi_dlhandle_l *)_ggi_malloc(sizeof(ggi_dlhandle_l));
---
> tmp = (ggi_dlhandle_l *)malloc(sizeof(ggi_dlhandle_l));
> if(tmp == NULL)
> return GGI_ENOMEM;
>
diff -r degas-old/lib/libggi/ggi/visual.c degas/lib/libggi/ggi/visual.c
48,88d47
< Memory allocation
< ******************************************************************************
< */
<
< void _ggi_mem_error(void) {
< ggiPanic("LibGGI is out of memory!\n");
< }
<
< void *_ggi_malloc(size_t siz)
< {
< void *mem = calloc(1, siz);
<
< if (mem == NULL) {
< _ggi_mem_error();
< }
< return mem;
< }
<
< void *_ggi_calloc(size_t siz)
< {
< void *mem = calloc(1, siz);
<
< if (mem == NULL) {
< _ggi_mem_error();
< }
< return mem;
< }
<
< void *_ggi_realloc(void *ptr, size_t siz)
< {
< void *mem = realloc(ptr, siz);
<
< if (mem == NULL) {
< _ggi_mem_error();
< }
< return mem;
< }
<
<
< /*
< ******************************************************************************
128c87,89
< head = _ggi_malloc(sizeof(*head) + sizeof(funcarr)*numfuncs);
---
> head = malloc(sizeof(*head) + sizeof(funcarr)*numfuncs);
> if(head == NULL)
> ggiPanic("LibGGI is out of memory!\n");
199,202c160,163
< LIBGGI_MODE(vis) = _ggi_calloc(sizeof(ggi_mode));
< LIBGGI_PIXFMT(vis) = _ggi_calloc(sizeof(ggi_pixelformat));
< LIBGGI_APPLIST(vis) = _ggi_calloc(sizeof(ggi_db_list));
< LIBGGI_PRIVLIST(vis) = _ggi_calloc(sizeof(ggi_db_list));
---
> LIBGGI_MODE(vis) = calloc(1, sizeof(ggi_mode));
> LIBGGI_PIXFMT(vis) = calloc(1, sizeof(ggi_pixelformat));
> LIBGGI_APPLIST(vis) = calloc(1, sizeof(ggi_db_list));
> LIBGGI_PRIVLIST(vis) = calloc(1, sizeof(ggi_db_list));
diff -r degas-old/lib/libggi/include/ggi/internal/internal.h
degas/lib/libggi/include/ggi/internal/internal.h
99,102d98
< void *_ggi_malloc(size_t siz);
< void *_ggi_calloc(size_t siz);
< void *_ggi_realloc(void *ptr, size_t siz);
< void _ggi_mem_error(void);
