summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-02-10 05:06:41 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:09:38 -0500
commite3aae721a7d5c8130448d67feb3a9200e14393ac (patch)
tree8572d558e6269fc758547cb3173c3bba4ad2c633
parentfedf0b0d91fdf2a6ae0ef47acd4047f662bd3374 (diff)
downloadsamba-e3aae721a7d5c8130448d67feb3a9200e14393ac.tar.gz
samba-e3aae721a7d5c8130448d67feb3a9200e14393ac.tar.bz2
samba-e3aae721a7d5c8130448d67feb3a9200e14393ac.zip
r5297: ensure pstring is not in the generated prototypes
(This used to be commit b4103d9f2b809408572521f385d4e7a5ba412169)
-rw-r--r--source4/lib/charcnv.c5
-rw-r--r--source4/lib/util.c2
2 files changed, 1 insertions, 6 deletions
diff --git a/source4/lib/charcnv.c b/source4/lib/charcnv.c
index d5727feb2c..4cf5d00465 100644
--- a/source4/lib/charcnv.c
+++ b/source4/lib/charcnv.c
@@ -508,11 +508,6 @@ size_t pull_ucs2(char *dest, const void *src, size_t dest_len, size_t src_len, i
return src_len;
}
-ssize_t pull_ucs2_pstring(char *dest, const void *src)
-{
- return pull_ucs2(dest, src, sizeof(pstring), -1, STR_TERMINATE);
-}
-
/**
* Copy a string from a UCS2 src to a unix char * destination, allocating a buffer using talloc
*
diff --git a/source4/lib/util.c b/source4/lib/util.c
index 9341a011af..dba2dbfe87 100644
--- a/source4/lib/util.c
+++ b/source4/lib/util.c
@@ -310,7 +310,7 @@ BOOL get_myfullname(char *my_name)
Get my own domain name.
****************************************************************************/
-BOOL get_mydomname(fstring my_domname)
+BOOL get_mydomname(char *my_domname)
{
pstring hostname;
char *p;