diff options
| author | jbj <devnull@localhost> | 2005-01-02 19:01:06 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2005-01-02 19:01:06 +0000 |
| commit | c82ffb778ac8e17f804e08165a1375ca9230c7f7 (patch) | |
| tree | 2a1bf6a1a41fca07c79ec394c07bbe881e936071 /db/fileops | |
| parent | 50f13cec8f285b20e83789c2f98246b7e11f0767 (diff) | |
| download | rpm-c82ffb778ac8e17f804e08165a1375ca9230c7f7.tar.gz rpm-c82ffb778ac8e17f804e08165a1375ca9230c7f7.tar.bz2 rpm-c82ffb778ac8e17f804e08165a1375ca9230c7f7.zip | |
Upgrade to db-4.3.27.
CVS patchset: 7654
CVS date: 2005/01/02 19:01:06
Diffstat (limited to 'db/fileops')
| -rw-r--r-- | db/fileops/fop_basic.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/db/fileops/fop_basic.c b/db/fileops/fop_basic.c index 0b6be860f..36a958e95 100644 --- a/db/fileops/fop_basic.c +++ b/db/fileops/fop_basic.c @@ -4,7 +4,7 @@ * Copyright (c) 2001-2004 * Sleepycat Software. All rights reserved. * - * $Id: fop_basic.c,v 1.31 2004/01/28 03:36:09 bostic Exp $ + * $Id: fop_basic.c,v 1.32 2004/11/15 20:04:50 bostic Exp $ */ #include "db_config.h" @@ -244,6 +244,7 @@ __fop_rename(dbenv, txn, oldname, newname, fid, appname, flags) int ret; char *n, *o; + o = n = NULL; if ((ret = __db_appname(dbenv, appname, oldname, 0, NULL, &o)) != 0) goto err; if ((ret = __db_appname(dbenv, appname, newname, 0, NULL, &n)) != 0) @@ -266,9 +267,9 @@ __fop_rename(dbenv, txn, oldname, newname, fid, appname, flags) ret = __memp_nameop(dbenv, fid, newname, o, n); -err: if (o != oldname) +err: if (o != NULL) __os_free(dbenv, o); - if (n != newname) + if (n != NULL) __os_free(dbenv, n); return (ret); } |