diff options
author | drh <drh@noemail.net> | 2007-08-22 20:18:21 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2007-08-22 20:18:21 +0000 |
commit | f3a65f7e443865f00b6799ba9637604b0ae55dc5 (patch) | |
tree | 5fc48b237b66cb49164f136fd222f6a49a21c304 /src/os_unix.c | |
parent | dd97a49c1a90e31dae5d47ee91e2618eb4b57eb8 (diff) | |
download | sqlite-f3a65f7e443865f00b6799ba9637604b0ae55dc5.tar.gz sqlite-f3a65f7e443865f00b6799ba9637604b0ae55dc5.zip |
The malloc.test script now passes all tests with no errors. (CVS 4271)
FossilOrigin-Name: db818430e9ea4ef4a4af575784009d5acae785a3
Diffstat (limited to 'src/os_unix.c')
-rw-r--r-- | src/os_unix.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 066ae6e58..75cf36e8d 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -2317,14 +2317,10 @@ static int fillInUnixFile( ** the file descriptor *pFd using close(). */ static int openDirectory(const char *zFilename, int *pFd){ - char *zDirname; int ii; int fd; + char zDirname[MAX_PATHNAME+1]; - zDirname = (char *)sqlite3_malloc(MAX_PATHNAME); - if( !zDirname ){ - return SQLITE_NOMEM; - } strncpy(zDirname, zFilename, MAX_PATHNAME); zDirname[MAX_PATHNAME-1] = '\0'; for(ii=strlen(zDirname); ii>=0 && zDirname[ii]!='/'; ii--); @@ -2338,7 +2334,6 @@ static int openDirectory(const char *zFilename, int *pFd){ OSTRACE3("OPENDIR %-3d %s\n", fd, zDirname); } } - sqlite3_free(zDirname); *pFd = fd; return (fd>0?SQLITE_OK:SQLITE_CANTOPEN); } |