[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-818-gafdea18

[Günther Deschner]

The branch, master has been updated
       via  afdea18fcf66ab9a03b542ea7f3d23d01a0a1931 (commit)
      from  c5dba4a82eb9f6cc199d20489c89a7765504919d (commit)

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


- Log -----------------------------------------------------------------
commit afdea18fcf66ab9a03b542ea7f3d23d01a0a1931
Author: Günther Deschner <gd at samba.org>
Date:   Wed Sep 30 01:23:13 2009 +0200

    s3-rpc_parse: remove unused prs_string.
    
    Guenther

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

Summary of changes:
 source3/include/proto.h       |    1 -
 source3/rpc_parse/parse_prs.c |   44 -----------------------------------------
 2 files changed, 0 insertions(+), 45 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 05651e2..e192ee9 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5701,7 +5701,6 @@ bool prs_uint8s(bool charmode, const char *name, prs_struct *ps, int depth, uint
 bool prs_uint16s(bool charmode, const char *name, prs_struct *ps, int depth, uint16 *data16s, int len);
 bool prs_uint32s(bool charmode, const char *name, prs_struct *ps, int depth, uint32 *data32s, int len);
 bool prs_unistr(const char *name, prs_struct *ps, int depth, UNISTR *str);
-bool prs_string(const char *name, prs_struct *ps, int depth, char *str, int max_buf_size);
 bool prs_init_data_blob(prs_struct *prs, DATA_BLOB *blob, TALLOC_CTX *mem_ctx);
 bool prs_data_blob(prs_struct *prs, DATA_BLOB *blob, TALLOC_CTX *mem_ctx);
 
diff --git a/source3/rpc_parse/parse_prs.c b/source3/rpc_parse/parse_prs.c
index edccded..aade037 100644
--- a/source3/rpc_parse/parse_prs.c
+++ b/source3/rpc_parse/parse_prs.c
@@ -1021,50 +1021,6 @@ bool prs_unistr(const char *name, prs_struct *ps, int depth, UNISTR *str)
 	return True;
 }
 
-
-/*******************************************************************
- Stream a null-terminated string.  len is strlen, and therefore does
- not include the null-termination character.
- ********************************************************************/
-
-bool prs_string(const char *name, prs_struct *ps, int depth, char *str, int max_buf_size)
-{
-	char *q;
-	int i;
-	int len;
-
-	if (UNMARSHALLING(ps))
-		len = strlen(&ps->data_p[ps->data_offset]);
-	else
-		len = strlen(str);
-
-	len = MIN(len, (max_buf_size-1));
-
-	q = prs_mem_get(ps, len+1);
-	if (q == NULL)
-		return False;
-
-	for(i = 0; i < len; i++) {
-		if (UNMARSHALLING(ps))
-			str[i] = q[i];
-		else
-			q[i] = str[i];
-	}
-
-	/* The terminating null. */
-	str[i] = '\0';
-
-	if (MARSHALLING(ps)) {
-		q[i] = '\0';
-	}
-
-	ps->data_offset += len+1;
-
-	dump_data(5+depth, (uint8 *)q, len);
-
-	return True;
-}
-
 /*******************************************************************
 creates a new prs_struct containing a DATA_BLOB
 ********************************************************************/


-- 
Samba Shared Repository