From: Volker Lendecke <vl@sernet.de>
Date: Wed, 3 Sep 2008 12:22:48 +0000 (+0200)
Subject: factor prs_append_some_data out of prs_append_some_prs_data
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=32cb45c962c822bd79a7d0f666f2f6037060b324;p=thirdparty%2Fsamba.git

factor prs_append_some_data out of prs_append_some_prs_data
---

diff --git a/source/include/proto.h b/source/include/proto.h
index abfc79024ad..291afac44d6 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -7822,6 +7822,8 @@ uint32 prs_data_size(prs_struct *ps);
 uint32 prs_offset(prs_struct *ps);
 bool prs_set_offset(prs_struct *ps, uint32 offset);
 bool prs_append_prs_data(prs_struct *dst, prs_struct *src);
+bool prs_append_some_data(prs_struct *dst, void *src_base, uint32_t start,
+			  uint32_t len);
 bool prs_append_some_prs_data(prs_struct *dst, prs_struct *src, int32 start, uint32 len);
 bool prs_copy_data_in(prs_struct *dst, const char *src, uint32 len);
 bool prs_copy_data_out(char *dst, prs_struct *src, uint32 len);
diff --git a/source/rpc_parse/parse_prs.c b/source/rpc_parse/parse_prs.c
index 072132f5ac2..b3deb80c5df 100644
--- a/source/rpc_parse/parse_prs.c
+++ b/source/rpc_parse/parse_prs.c
@@ -395,18 +395,26 @@ bool prs_append_prs_data(prs_struct *dst, prs_struct *src)
  Append some data from one parse_struct into another.
  ********************************************************************/
 
-bool prs_append_some_prs_data(prs_struct *dst, prs_struct *src, int32 start, uint32 len)
-{	
-	if (len == 0)
-		return True;
+bool prs_append_some_data(prs_struct *dst, void *src_base, uint32_t start,
+			  uint32_t len)
+{
+	if (len == 0) {
+		return true;
+	}
 
-	if(!prs_grow(dst, len))
-		return False;
-	
-	memcpy(&dst->data_p[dst->data_offset], src->data_p + start, (size_t)len);
+	if(!prs_grow(dst, len)) {
+		return false;
+	}
+
+	memcpy(&dst->data_p[dst->data_offset], src_base + start, (size_t)len);
 	dst->data_offset += len;
+	return true;
+}
 
-	return True;
+bool prs_append_some_prs_data(prs_struct *dst, prs_struct *src, int32 start,
+			      uint32 len)
+{
+	return prs_append_some_data(dst, src->data_p, start, len);
 }
 
 /*******************************************************************