r5501: check the return of talloc with the NT_STATUS_HAVE_NO_MEMORY()
authorStefan Metzmacher <metze@samba.org>
Tue, 22 Feb 2005 11:35:38 +0000 (11:35 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 18:10:51 +0000 (13:10 -0500)
macro...

metze
(This used to be commit 9ec6c0e97765e60ef195296f17d6a27b5d0dcca9)

source4/ntvfs/ipc/vfs_ipc.c
source4/ntvfs/posix/vfs_posix.c

index 04a1a06db35c3b0e16b1a4b3311f779afc35423f..abb4c51f65f7964c085e9c219c287b37152e6ae1 100644 (file)
@@ -80,7 +80,10 @@ static NTSTATUS ipc_connect(struct ntvfs_module_context *ntvfs,
        struct ipc_private *private;
 
        tcon->fs_type = talloc_strdup(tcon, "IPC");
        struct ipc_private *private;
 
        tcon->fs_type = talloc_strdup(tcon, "IPC");
+       NT_STATUS_HAVE_NO_MEMORY(tcon->fs_type);
+
        tcon->dev_type = talloc_strdup(tcon, "IPC");
        tcon->dev_type = talloc_strdup(tcon, "IPC");
+       NT_STATUS_HAVE_NO_MEMORY(tcon->dev_type);
 
        /* prepare the private state for this connection */
        private = talloc(tcon, struct ipc_private);
 
        /* prepare the private state for this connection */
        private = talloc(tcon, struct ipc_private);
index 529ff7a98b43fdca6771779ad6b920e8a5deba3f..ec8db07d017762a2ed1748fbaf49792bac08ff11 100644 (file)
@@ -107,12 +107,11 @@ static NTSTATUS pvfs_connect(struct ntvfs_module_context *ntvfs,
        NTSTATUS status;
 
        pvfs = talloc_zero(tcon, struct pvfs_state);
        NTSTATUS status;
 
        pvfs = talloc_zero(tcon, struct pvfs_state);
-       if (pvfs == NULL) {
-               return NT_STATUS_NO_MEMORY;
-       }
+       NT_STATUS_HAVE_NO_MEMORY(pvfs);
 
        /* for simplicity of path construction, remove any trailing slash now */
        base_directory = talloc_strdup(pvfs, lp_pathname(tcon->service));
 
        /* for simplicity of path construction, remove any trailing slash now */
        base_directory = talloc_strdup(pvfs, lp_pathname(tcon->service));
+       NT_STATUS_HAVE_NO_MEMORY(base_directory);
        trim_string(base_directory, NULL, "/");
 
        pvfs->tcon = tcon;
        trim_string(base_directory, NULL, "/");
 
        pvfs->tcon = tcon;
@@ -127,7 +126,10 @@ static NTSTATUS pvfs_connect(struct ntvfs_module_context *ntvfs,
        }
 
        tcon->fs_type = talloc_strdup(tcon, "NTFS");
        }
 
        tcon->fs_type = talloc_strdup(tcon, "NTFS");
+       NT_STATUS_HAVE_NO_MEMORY(tcon->fs_type);
+
        tcon->dev_type = talloc_strdup(tcon, "A:");
        tcon->dev_type = talloc_strdup(tcon, "A:");
+       NT_STATUS_HAVE_NO_MEMORY(tcon->dev_type);
 
        ntvfs->private_data = pvfs;
 
 
        ntvfs->private_data = pvfs;
 
@@ -153,20 +155,14 @@ static NTSTATUS pvfs_connect(struct ntvfs_module_context *ntvfs,
 
        /* allocate the fnum id -> ptr tree */
        pvfs->idtree_fnum = idr_init(pvfs);
 
        /* allocate the fnum id -> ptr tree */
        pvfs->idtree_fnum = idr_init(pvfs);
-       if (pvfs->idtree_fnum == NULL) {
-               return NT_STATUS_NO_MEMORY;
-       }
+       NT_STATUS_HAVE_NO_MEMORY(pvfs->idtree_fnum);
 
        /* allocate the search handle -> ptr tree */
        pvfs->idtree_search = idr_init(pvfs);
 
        /* allocate the search handle -> ptr tree */
        pvfs->idtree_search = idr_init(pvfs);
-       if (pvfs->idtree_search == NULL) {
-               return NT_STATUS_NO_MEMORY;
-       }
+       NT_STATUS_HAVE_NO_MEMORY(pvfs->idtree_search);
 
        status = pvfs_mangle_init(pvfs);
 
        status = pvfs_mangle_init(pvfs);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
+       NT_STATUS_NOT_OK_RETURN(status);
 
        pvfs_setup_options(pvfs);
 
 
        pvfs_setup_options(pvfs);
 
@@ -200,9 +196,7 @@ static NTSTATUS pvfs_chkpath(struct ntvfs_module_context *ntvfs,
 
        /* resolve the cifs name to a posix name */
        status = pvfs_resolve_name(pvfs, req, cp->in.path, 0, &name);
 
        /* resolve the cifs name to a posix name */
        status = pvfs_resolve_name(pvfs, req, cp->in.path, 0, &name);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
+       NT_STATUS_NOT_OK_RETURN(status);
 
        if (!name->exists) {
                return NT_STATUS_OBJECT_NAME_NOT_FOUND;
 
        if (!name->exists) {
                return NT_STATUS_OBJECT_NAME_NOT_FOUND;