From 8237a8528e78b9f4a5ae529103bcd978a1f97d9c Mon Sep 17 00:00:00 2001 From: edgrif <edgrif> Date: Fri, 16 Jul 2004 08:51:29 +0000 Subject: [PATCH] change mallocs to g_malloc0 --- src/zmapWindow/seqregion.c | 6 +++--- src/zmapWindow/stringbucket.c | 6 +++--- src/zmapWindow/zmapbccol.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/zmapWindow/seqregion.c b/src/zmapWindow/seqregion.c index 9955df1c1..0b6eda95a 100755 --- a/src/zmapWindow/seqregion.c +++ b/src/zmapWindow/seqregion.c @@ -25,9 +25,9 @@ * Description: * Exported functions: See XXXXXXXXXXXXX.h * HISTORY: - * Last edited: Jun 30 13:58 2004 (edgrif) + * Last edited: Jul 16 09:50 2004 (edgrif) * Created: Wed Jun 30 13:38:10 2004 (edgrif) - * CVS info: $Id: seqregion.c,v 1.5 2004-07-01 09:26:24 edgrif Exp $ + * CVS info: $Id: seqregion.c,v 1.6 2004-07-16 08:51:29 edgrif Exp $ *------------------------------------------------------------------- */ @@ -63,7 +63,7 @@ Coord srCoord(ZMapRegion *zMapRegion, InvarCoord coord) /* Creates a new, empty ZMapRegion structure. */ ZMapRegion *srCreate(void) { - ZMapRegion *zMapRegion = (ZMapRegion*)g_malloc(sizeof(ZMapRegion)) ; + ZMapRegion *zMapRegion = (ZMapRegion*)g_malloc0(sizeof(ZMapRegion)) ; zMapRegion->area1 = zMapRegion->area2 = 0 ; zMapRegion->methods = NULL ; diff --git a/src/zmapWindow/stringbucket.c b/src/zmapWindow/stringbucket.c index 1a4130784..755753893 100755 --- a/src/zmapWindow/stringbucket.c +++ b/src/zmapWindow/stringbucket.c @@ -1,4 +1,4 @@ -/* Last edited: Jul 5 14:37 2004 (rnc) */ +/* Last edited: Jul 16 09:50 2004 (edgrif) */ /* file: stringbucket.c * Author: Simon Kelley (srk@sanger.ac.uk) * Copyright (c) Sanger Institute, 2003 @@ -42,7 +42,7 @@ struct sbucketchain { StringBucket *sbCreate(void) { - StringBucket *b = g_malloc(sizeof(struct sbucket)) ; + StringBucket *b = g_malloc0(sizeof(struct sbucket)) ; b->chain = NULL; @@ -74,7 +74,7 @@ char *str2p(char *string, StringBucket *b) if (!c) { - c = g_malloc(sizeof(struct sbucketchain) + strlen(string) + 1) ; + c = g_malloc0(sizeof(struct sbucketchain) + strlen(string) + 1) ; c->next = b->chain; b->chain = c; diff --git a/src/zmapWindow/zmapbccol.c b/src/zmapWindow/zmapbccol.c index 4ac2599b5..86ea36998 100755 --- a/src/zmapWindow/zmapbccol.c +++ b/src/zmapWindow/zmapbccol.c @@ -1,4 +1,4 @@ -/* Last edited: Jul 6 10:20 2004 (rnc) */ +/* Last edited: Jul 16 09:51 2004 (edgrif) */ /* file: zmapbccol.c * Author: Simon Kelley (srk@sanger.ac.uk) * Copyright (c) Sanger Institute, 2003 @@ -154,7 +154,7 @@ void nbcInit(ZMapPane pane, ZMapColumn *col) { /* this whole bit needs to be rewritten, so it's OK to comment it out, I think srMeth *meth = srMethodFromID(zMapPaneGetZMapRegion(pane), col->meth); - nbcPrivate *bc = (nbcPrivate*)malloc(sizeof(nbcPrivate)); + nbcPrivate *bc = (nbcPrivate*)g_malloc0(sizeof(nbcPrivate)); // nbcPrivate *bc = handleAlloc(nbcFinalise, zMapWindowGetHandle(pane->window), // sizeof(nbcPrivate)); -- GitLab