Register types rather than constructors, display structs as classes.

[jelmer/samba4-debian.git] / source / libcli / clitrans2.c

diff --git a/source/libcli/clitrans2.c b/source/libcli/clitrans2.c
index 777150a2577141ae7993326c12e658284700b3b1..5c5ba6585f6eb1e287678ca544b222ba3ec40134 100644 (file)
--- a/source/libcli/clitrans2.c
+++ b/source/libcli/clitrans2.c
@@ -5,7 +5,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -14,31 +14,32 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 /****************************************************************************
 send a qpathinfo call
 ****************************************************************************/
-NTSTATUS cli_qpathinfo(struct cli_tree *tree, const char *fname, 
+NTSTATUS smbcli_qpathinfo(struct smbcli_tree *tree, const char *fname, 
                       time_t *c_time, time_t *a_time, time_t *m_time, 
-                      size_t *size, uint16 *mode)
+                      size_t *size, uint16_t *mode)
 {
        union smb_fileinfo parms;
        TALLOC_CTX *mem_ctx;
        NTSTATUS status;
 
-       mem_ctx = talloc_init("cli_qpathinfo");
+       mem_ctx = talloc_init("smbcli_qpathinfo");
        if (!mem_ctx) return NT_STATUS_NO_MEMORY;
 
        parms.standard.level = RAW_FILEINFO_STANDARD;
-       parms.standard.in.fname = fname;
+       parms.standard.in.file.path = fname;
 
        status = smb_raw_pathinfo(tree, mem_ctx, &parms);
-       talloc_destroy(mem_ctx);
+       talloc_free(mem_ctx);
        if (!NT_STATUS_IS_OK(status))
                return status;
 
@@ -64,37 +65,37 @@ NTSTATUS cli_qpathinfo(struct cli_tree *tree, const char *fname,
 /****************************************************************************
 send a qpathinfo call with the SMB_QUERY_FILE_ALL_INFO info level
 ****************************************************************************/
-NTSTATUS cli_qpathinfo2(struct cli_tree *tree, const char *fname, 
+NTSTATUS smbcli_qpathinfo2(struct smbcli_tree *tree, const char *fname, 
                        time_t *c_time, time_t *a_time, time_t *m_time, 
-                       time_t *w_time, size_t *size, uint16 *mode,
-                       SMB_INO_T *ino)
+                       time_t *w_time, size_t *size, uint16_t *mode,
+                       ino_t *ino)
 {
        union smb_fileinfo parms;
        TALLOC_CTX *mem_ctx;
        NTSTATUS status;
 
-       mem_ctx = talloc_init("cli_qfilename");
+       mem_ctx = talloc_init("smbcli_qfilename");
        if (!mem_ctx) return NT_STATUS_NO_MEMORY;
 
        parms.all_info.level = RAW_FILEINFO_ALL_INFO;
-       parms.all_info.in.fname = fname;
+       parms.all_info.in.file.path = fname;
 
        status = smb_raw_pathinfo(tree, mem_ctx, &parms);
-       talloc_destroy(mem_ctx);
+       talloc_free(mem_ctx);
        if (!NT_STATUS_IS_OK(status))
                return status;
 
        if (c_time) {
-               *c_time = nt_time_to_unix(&parms.all_info.out.create_time);
+               *c_time = nt_time_to_unix(parms.all_info.out.create_time);
        }
        if (a_time) {
-               *a_time = nt_time_to_unix(&parms.all_info.out.access_time);
+               *a_time = nt_time_to_unix(parms.all_info.out.access_time);
        }
        if (m_time) {
-               *m_time = nt_time_to_unix(&parms.all_info.out.change_time);
+               *m_time = nt_time_to_unix(parms.all_info.out.change_time);
        }
        if (w_time) {
-               *w_time = nt_time_to_unix(&parms.all_info.out.write_time);
+               *w_time = nt_time_to_unix(parms.all_info.out.write_time);
        }
        if (size) {
                *size = parms.all_info.out.size;
@@ -110,28 +111,28 @@ NTSTATUS cli_qpathinfo2(struct cli_tree *tree, const char *fname,
 /****************************************************************************
 send a qfileinfo QUERY_FILE_NAME_INFO call
 ****************************************************************************/
-NTSTATUS cli_qfilename(struct cli_tree *tree, int fnum, const char **name)
+NTSTATUS smbcli_qfilename(struct smbcli_tree *tree, int fnum, const char **name)
 {
        union smb_fileinfo parms;
        TALLOC_CTX *mem_ctx;
        NTSTATUS status;
 
-       mem_ctx = talloc_init("cli_qfilename");
+       mem_ctx = talloc_init("smbcli_qfilename");
        if (!mem_ctx) return NT_STATUS_NO_MEMORY;
 
        parms.name_info.level = RAW_FILEINFO_NAME_INFO;
-       parms.name_info.in.fnum = fnum;
+       parms.name_info.in.file.fnum = fnum;
 
        status = smb_raw_fileinfo(tree, mem_ctx, &parms);
        if (!NT_STATUS_IS_OK(status)) {
-               talloc_destroy(mem_ctx);
+               talloc_free(mem_ctx);
                *name = NULL;
                return status;
        }
 
        *name = strdup(parms.name_info.out.fname.s);
 
-       talloc_destroy(mem_ctx);
+       talloc_free(mem_ctx);
 
        return status;
 }
@@ -140,39 +141,39 @@ NTSTATUS cli_qfilename(struct cli_tree *tree, int fnum, const char **name)
 /****************************************************************************
 send a qfileinfo call
 ****************************************************************************/
-NTSTATUS cli_qfileinfo(struct cli_tree *tree, int fnum, 
-                      uint16 *mode, size_t *size,
+NTSTATUS smbcli_qfileinfo(struct smbcli_tree *tree, int fnum, 
+                      uint16_t *mode, size_t *size,
                       time_t *c_time, time_t *a_time, time_t *m_time, 
-                      time_t *w_time, SMB_INO_T *ino)
+                      time_t *w_time, ino_t *ino)
 {
        union smb_fileinfo parms;
        TALLOC_CTX *mem_ctx;
        NTSTATUS status;
 
-       mem_ctx = talloc_init("cli_qfileinfo");
+       mem_ctx = talloc_init("smbcli_qfileinfo");
        if (!mem_ctx) 
                return NT_STATUS_NO_MEMORY;
 
        parms.all_info.level = RAW_FILEINFO_ALL_INFO;
-       parms.all_info.in.fnum = fnum;
+       parms.all_info.in.file.fnum = fnum;
 
        status = smb_raw_fileinfo(tree, mem_ctx, &parms);
-       talloc_destroy(mem_ctx);
+       talloc_free(mem_ctx);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
 
        if (c_time) {
-               *c_time = nt_time_to_unix(&parms.all_info.out.create_time);
+               *c_time = nt_time_to_unix(parms.all_info.out.create_time);
        }
        if (a_time) {
-               *a_time = nt_time_to_unix(&parms.all_info.out.access_time);
+               *a_time = nt_time_to_unix(parms.all_info.out.access_time);
        }
        if (m_time) {
-               *m_time = nt_time_to_unix(&parms.all_info.out.change_time);
+               *m_time = nt_time_to_unix(parms.all_info.out.change_time);
        }
        if (w_time) {
-               *w_time = nt_time_to_unix(&parms.all_info.out.write_time);
+               *w_time = nt_time_to_unix(parms.all_info.out.write_time);
        }
        if (mode) {
                *mode = parms.all_info.out.attrib;
@@ -191,7 +192,7 @@ NTSTATUS cli_qfileinfo(struct cli_tree *tree, int fnum,
 /****************************************************************************
 send a qpathinfo SMB_QUERY_FILE_ALT_NAME_INFO call
 ****************************************************************************/
-NTSTATUS cli_qpathinfo_alt_name(struct cli_tree *tree, const char *fname, 
+NTSTATUS smbcli_qpathinfo_alt_name(struct smbcli_tree *tree, const char *fname, 
                                const char **alt_name)
 {
        union smb_fileinfo parms;
@@ -199,16 +200,16 @@ NTSTATUS cli_qpathinfo_alt_name(struct cli_tree *tree, const char *fname,
        NTSTATUS status;
 
        parms.alt_name_info.level = RAW_FILEINFO_ALT_NAME_INFO;
-       parms.alt_name_info.in.fname = fname;
+       parms.alt_name_info.in.file.path = fname;
 
-       mem_ctx = talloc_init("cli_qpathinfo_alt_name");
+       mem_ctx = talloc_init("smbcli_qpathinfo_alt_name");
        if (!mem_ctx) return NT_STATUS_NO_MEMORY;
 
        status = smb_raw_pathinfo(tree, mem_ctx, &parms);
        if (!NT_STATUS_IS_OK(status)) {
-               talloc_destroy(mem_ctx);
+               talloc_free(mem_ctx);
                *alt_name = NULL;
-               return cli_nt_error(tree);
+               return smbcli_nt_error(tree);
        }
 
        if (!parms.alt_name_info.out.fname.s) {
@@ -217,7 +218,7 @@ NTSTATUS cli_qpathinfo_alt_name(struct cli_tree *tree, const char *fname,
                *alt_name = strdup(parms.alt_name_info.out.fname.s);
        }
 
-       talloc_destroy(mem_ctx);
+       talloc_free(mem_ctx);
 
        return NT_STATUS_OK;
 }