[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-532-g9ab8953

[Günther Deschner]

The branch, master has been updated
       via  9ab8953d74491d7ab4a30c242aa0935efb38f857 (commit)
      from  9fdeb7f7b319dca5dbd1fdaf24f01fb19e124fe6 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 9ab8953d74491d7ab4a30c242aa0935efb38f857
Author: Günther Deschner <gd at samba.org>
Date:   Wed Mar 18 15:05:44 2009 +0100

    s3-rpc_parse: move prs_uint64 to rpc_parse/parse_prs.c.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/include/proto.h        |    2 +-
 source3/rpc_parse/parse_misc.c |   24 ------------------------
 source3/rpc_parse/parse_prs.c  |   24 ++++++++++++++++++++++++
 3 files changed, 25 insertions(+), 25 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 1c2abc6..5019cb6 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5698,7 +5698,6 @@ bool smb_io_unistr2(const char *desc, UNISTR2 *uni2, uint32 buffer, prs_struct *
 bool smb_io_pol_hnd(const char *desc, POLICY_HND *pol, prs_struct *ps, int depth);
 void init_unistr3(UNISTR3 *str, const char *buf);
 bool smb_io_unistr3(const char *desc, UNISTR3 *name, prs_struct *ps, int depth);
-bool prs_uint64(const char *name, prs_struct *ps, int depth, uint64 *data64);
 uint32 str_len_uni(UNISTR *source);
 bool policy_handle_is_valid(const POLICY_HND *hnd);
 
@@ -5748,6 +5747,7 @@ bool prs_pointer( const char *name, prs_struct *ps, int depth,
 bool prs_uint16(const char *name, prs_struct *ps, int depth, uint16 *data16);
 bool prs_uint32(const char *name, prs_struct *ps, int depth, uint32 *data32);
 bool prs_int32(const char *name, prs_struct *ps, int depth, int32 *data32);
+bool prs_uint64(const char *name, prs_struct *ps, int depth, uint64 *data64);
 bool prs_ntstatus(const char *name, prs_struct *ps, int depth, NTSTATUS *status);
 bool prs_dcerpc_status(const char *name, prs_struct *ps, int depth, NTSTATUS *status);
 bool prs_werror(const char *name, prs_struct *ps, int depth, WERROR *status);
diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c
index e948afd..d966790 100644
--- a/source3/rpc_parse/parse_misc.c
+++ b/source3/rpc_parse/parse_misc.c
@@ -632,30 +632,6 @@ bool smb_io_unistr3(const char *desc, UNISTR3 *name, prs_struct *ps, int depth)
 }
 
 /*******************************************************************
- Stream a uint64_struct
- ********************************************************************/
-bool prs_uint64(const char *name, prs_struct *ps, int depth, uint64 *data64)
-{
-	if (UNMARSHALLING(ps)) {
-		uint32 high, low;
-
-		if (!prs_uint32(name, ps, depth+1, &low))
-			return False;
-
-		if (!prs_uint32(name, ps, depth+1, &high))
-			return False;
-
-		*data64 = ((uint64_t)high << 32) + low;
-
-		return True;
-	} else {
-		uint32 high = (*data64) >> 32, low = (*data64) & 0xFFFFFFFF;
-		return prs_uint32(name, ps, depth+1, &low) && 
-			   prs_uint32(name, ps, depth+1, &high);
-	}
-}
-
-/*******************************************************************
 return the length of a UNISTR string.
 ********************************************************************/  
 
diff --git a/source3/rpc_parse/parse_prs.c b/source3/rpc_parse/parse_prs.c
index bc9202c..c420189 100644
--- a/source3/rpc_parse/parse_prs.c
+++ b/source3/rpc_parse/parse_prs.c
@@ -760,6 +760,30 @@ bool prs_int32(const char *name, prs_struct *ps, int depth, int32 *data32)
 }
 
 /*******************************************************************
+ Stream a uint64_struct
+ ********************************************************************/
+bool prs_uint64(const char *name, prs_struct *ps, int depth, uint64 *data64)
+{
+	if (UNMARSHALLING(ps)) {
+		uint32 high, low;
+
+		if (!prs_uint32(name, ps, depth+1, &low))
+			return False;
+
+		if (!prs_uint32(name, ps, depth+1, &high))
+			return False;
+
+		*data64 = ((uint64_t)high << 32) + low;
+
+		return True;
+	} else {
+		uint32 high = (*data64) >> 32, low = (*data64) & 0xFFFFFFFF;
+		return prs_uint32(name, ps, depth+1, &low) &&
+			   prs_uint32(name, ps, depth+1, &high);
+	}
+}
+
+/*******************************************************************
  Stream a NTSTATUS
  ********************************************************************/
 


-- 
Samba Shared Repository