Changeset 630 for trunk/client/src

Timestamp:

Aug 31, 2011, 8:07:05 PM (14 years ago)

Author:

Silvan Scherrer

Message:

Samba Client 2.2: adjusted some more bits

File:

• trunk/client/src/smbwrp.c (modified) (12 diffs)

trunk/client/src/smbwrp.c

@@ -698 +698 @@
 
         
-        if (!cli_close(cli, file->fd))
+        if (!NT_STATUS_IS_OK(cli_close(cli, file->fd)))
         {
                 return os2cli_errno(cli);
@@ -707 +707 @@
         {
                 debuglocal(4,"Set attr on close %s %08x %d %d\n", file->fname, file->openattr, file->mtime, file->mtime);
-                if (!cli_setatr(cli, file->fname, file->openattr, file->mtime)) 
+                if (!NT_STATUS_IS_OK(cli_setatr(cli, file->fname, file->openattr, file->mtime))) 
                 {
                         debuglocal(4,"Set attr on close failed %d\n", os2cli_errno(cli));
@@ -776 +776 @@
                 }
 
-                if (!cli_close(cli, file->fd))
+                if (!NT_STATUS_IS_OK(cli_close(cli, file->fd)))
                 {
                         return os2cli_errno(cli);
@@ -808 +808 @@
         //cli_unlink(cli, newname);
 //      if (!cli_rename(cli, oldname, newname) && !cli_ntrename(cli, oldname, newname)) 
-        if (!cli_rename(cli, oldname, newname)) 
+        if (!NT_STATUS_IS_OK(cli_rename(cli, oldname, newname)))
         {
                 return os2cli_errno(cli);
@@ -829 +829 @@
         // we already have gmt time, so no need to add timezone
         // if (!cli_setatr(cli, finfo->fname, finfo->attr, finfo->mtime + (finfo->mtime == 0 ? 0 : get_time_zone(finfo->mtime)))
-        if (!cli_setatr(cli, finfo->fname, finfo->attr, finfo->mtime)
-                && !cli_setatr(cli, finfo->fname, finfo->attr, 0)) 
+        if (!NT_STATUS_IS_OK(cli_setatr(cli, finfo->fname, finfo->attr, finfo->mtime))
+                && !NT_STATUS_IS_OK(cli_setatr(cli, finfo->fname, finfo->attr, 0)))
         {
                 return os2cli_errno(cli);
@@ -899 +899 @@
                                    NULL, &size, NULL, NULL, NULL, 
                                    NULL, NULL) &&
-                    !cli_getattrE(cli, file->fd, 
-                                  NULL, &size, NULL, NULL, NULL)) 
+                    !NT_STATUS_IS_OK(cli_getattrE(cli, file->fd, 
+                                  NULL, &size, NULL, NULL, NULL)))
                 {
                         return os2cli_errno(cli);
@@ -978 +978 @@
         }
 
-        if (cli_getatr(cli, finfo->fname, (unsigned short *)&finfo->attr, &finfo->size, (time_t *)&finfo->mtime)) 
+        if (NT_STATUS_IS_OK(cli_getatr(cli, finfo->fname, (unsigned short *)&finfo->attr, &finfo->size, (time_t *)&finfo->mtime)))
         {
 //debuglocal(2,("gotattr1 %08x <%s>\n", finfo->attr, finfo->fname));
@@ -1007 +1007 @@
                            &ino))
         {
-                if (!cli_getattrE(cli, file->fd, 
-                          (unsigned short *)&finfo->attr, (&finfo->size), (time_t *)&finfo->ctime, (time_t *)&finfo->atime, (time_t *)&finfo->mtime)) 
+                if (!NT_STATUS_IS_OK(cli_getattrE(cli, file->fd, 
+                          (unsigned short *)&finfo->attr, (&finfo->size), (time_t *)&finfo->ctime, (time_t *)&finfo->atime, (time_t *)&finfo->mtime)))
                 {
                         return os2cli_errno(cli);
@@ -1680 +1680 @@
         }
 
-        if (!cli_mkdir(cli, fname)) 
+        if (!NT_STATUS_IS_OK(cli_mkdir(cli, fname)))
         {
                 return os2cli_errno(cli);
@@ -1697 +1697 @@
         }
 
-        if (!cli_rmdir(cli, fname)) 
+        if (!NT_STATUS_IS_OK(cli_rmdir(cli, fname)))
         {
                 return os2cli_errno(cli);
@@ -1713 +1713 @@
                 return maperror(EINVAL);
         }
-        if (!cli_set_ea_path(cli, fname, name, value, size)) 
+        if (!cli_set_ea_path(cli, fname, name, value, size))
         {
                 return os2cli_errno(cli);
@@ -1859 +1859 @@
         }
 
-        if (!cli_dskattr(cli, &bsize, &total, &avail)) 
+        if (!NT_STATUS_IS_OK(cli_dskattr(cli, &bsize, &total, &avail))) 
         {
                 debuglocal(4,"Error in dskattr: %s\n",cli_errstr(cli));