diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-12-03 06:24:38 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:06:18 -0500 |
| commit | 58c326809a816703dc516c3022c9c4dbb9d09445 (patch) | |
| tree | 3900a7b59edf075e09459e0bf5f85097396bd9aa /source4/ntvfs/common/opendb.c | |
| parent | c9932a3a92dd7b8696e4e145c7d7e2c080b46ffb (diff) | |
| download | samba-58c326809a816703dc516c3022c9c4dbb9d09445.tar.gz samba-58c326809a816703dc516c3022c9c4dbb9d09445.tar.bz2 samba-58c326809a816703dc516c3022c9c4dbb9d09445.zip | |
r4052: fixed a bunch of code to use the type safe _p allocation macros
(This used to be commit 80d15fa3402a9d1183467463f6b21c0b674bc442)
Diffstat (limited to 'source4/ntvfs/common/opendb.c')
| -rw-r--r-- | source4/ntvfs/common/opendb.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/source4/ntvfs/common/opendb.c b/source4/ntvfs/common/opendb.c index 8947a5d255..57beba8c68 100644 --- a/source4/ntvfs/common/opendb.c +++ b/source4/ntvfs/common/opendb.c @@ -222,7 +222,6 @@ NTSTATUS odb_open_file(struct odb_lock *lck, void *file_handle, struct odb_context *odb = lck->odb; TDB_DATA dbuf; struct odb_entry e; - char *tp; int i, count; struct odb_entry *elist; @@ -249,13 +248,13 @@ NTSTATUS odb_open_file(struct odb_lock *lck, void *file_handle, } } - tp = Realloc(dbuf.dptr, (count+1) * sizeof(struct odb_entry)); - if (tp == NULL) { + elist = realloc_p(dbuf.dptr, struct odb_entry, count+1); + if (elist == NULL) { if (dbuf.dptr) free(dbuf.dptr); return NT_STATUS_NO_MEMORY; } - dbuf.dptr = tp; + dbuf.dptr = (char *)elist; dbuf.dsize = (count+1) * sizeof(struct odb_entry); memcpy(dbuf.dptr + (count*sizeof(struct odb_entry)), @@ -279,7 +278,6 @@ NTSTATUS odb_open_file_pending(struct odb_lock *lck, void *private) struct odb_context *odb = lck->odb; TDB_DATA dbuf; struct odb_entry e; - char *tp; struct odb_entry *elist; int count; @@ -299,13 +297,13 @@ NTSTATUS odb_open_file_pending(struct odb_lock *lck, void *private) elist = (struct odb_entry *)dbuf.dptr; count = dbuf.dsize / sizeof(struct odb_entry); - tp = Realloc(dbuf.dptr, (count+1) * sizeof(struct odb_entry)); - if (tp == NULL) { + elist = realloc_p(dbuf.dptr, struct odb_entry, count+1); + if (elist == NULL) { if (dbuf.dptr) free(dbuf.dptr); return NT_STATUS_NO_MEMORY; } - dbuf.dptr = tp; + dbuf.dptr = (char *)elist; dbuf.dsize = (count+1) * sizeof(struct odb_entry); memcpy(dbuf.dptr + (count*sizeof(struct odb_entry)), |