summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-03-18 15:05:44 +0100
committerGünther Deschner <gd@samba.org>2009-03-18 16:43:28 +0100
commit9ab8953d74491d7ab4a30c242aa0935efb38f857 (patch)
tree1b5fee351eb76226eed45fd1cd5bb62123bec8cc
parent9fdeb7f7b319dca5dbd1fdaf24f01fb19e124fe6 (diff)
downloadsamba-9ab8953d74491d7ab4a30c242aa0935efb38f857.tar.gz
samba-9ab8953d74491d7ab4a30c242aa0935efb38f857.tar.bz2
samba-9ab8953d74491d7ab4a30c242aa0935efb38f857.zip
s3-rpc_parse: move prs_uint64 to rpc_parse/parse_prs.c.
Guenther
-rw-r--r--source3/include/proto.h2
-rw-r--r--source3/rpc_parse/parse_misc.c24
-rw-r--r--source3/rpc_parse/parse_prs.c24
3 files changed, 25 insertions, 25 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 1c2abc6017..5019cb6b9d 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 e948afde87..d966790249 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 bc9202cccc..c42018947f 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
********************************************************************/