summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2003-12-16 12:59:20 +0000
committerAndrew Tridgell <tridge@samba.org>2003-12-16 12:59:20 +0000
commit938eef5bebed15cca6259c760d0afc00f5c088e6 (patch)
treeaa92eff49fe2f14247f7d3201f378563482f6a71
parent60deb10a2c9cd41c6ab3ff5e788858ba203e490f (diff)
downloadsamba-938eef5bebed15cca6259c760d0afc00f5c088e6.tar.gz
samba-938eef5bebed15cca6259c760d0afc00f5c088e6.tar.bz2
samba-938eef5bebed15cca6259c760d0afc00f5c088e6.zip
removed some unused functions
(This used to be commit 09d17d705a6e378a7c1a40b29d2e091200b6d757)
-rw-r--r--source4/lib/util_str.c87
1 files changed, 0 insertions, 87 deletions
diff --git a/source4/lib/util_str.c b/source4/lib/util_str.c
index ace2e19be3..07fdf334fd 100644
--- a/source4/lib/util_str.c
+++ b/source4/lib/util_str.c
@@ -737,11 +737,6 @@ void string_sub(char *s,const char *pattern, const char *insert, size_t len)
}
}
-void fstring_sub(char *s,const char *pattern,const char *insert)
-{
- string_sub(s, pattern, insert, sizeof(fstring));
-}
-
void pstring_sub(char *s,const char *pattern,const char *insert)
{
string_sub(s, pattern, insert, sizeof(pstring));
@@ -855,71 +850,6 @@ void all_string_sub(char *s,const char *pattern,const char *insert, size_t len)
}
/**
- Similar to all_string_sub but for unicode strings.
- Return a new allocated unicode string.
- similar to string_sub() but allows for any character to be substituted.
- Use with caution!
-**/
-
-smb_ucs2_t *all_string_sub_w(const smb_ucs2_t *s, const smb_ucs2_t *pattern,
- const smb_ucs2_t *insert)
-{
- smb_ucs2_t *r, *rp;
- const smb_ucs2_t *sp;
- size_t lr, lp, li, lt;
-
- if (!insert || !pattern || !*pattern || !s)
- return NULL;
-
- lt = (size_t)strlen_w(s);
- lp = (size_t)strlen_w(pattern);
- li = (size_t)strlen_w(insert);
-
- if (li > lp) {
- const smb_ucs2_t *st = s;
- int ld = li - lp;
- while ((sp = strstr_w(st, pattern))) {
- st = sp + lp;
- lt += ld;
- }
- }
-
- r = rp = (smb_ucs2_t *)malloc((lt + 1)*(sizeof(smb_ucs2_t)));
- if (!r) {
- DEBUG(0, ("all_string_sub_w: out of memory!\n"));
- return NULL;
- }
-
- while ((sp = strstr_w(s, pattern))) {
- memcpy(rp, s, (sp - s));
- rp += ((sp - s) / sizeof(smb_ucs2_t));
- memcpy(rp, insert, (li * sizeof(smb_ucs2_t)));
- s = sp + lp;
- rp += li;
- }
- lr = ((rp - r) / sizeof(smb_ucs2_t));
- if (lr < lt) {
- memcpy(rp, s, ((lt - lr) * sizeof(smb_ucs2_t)));
- rp += (lt - lr);
- }
- *rp = 0;
-
- return r;
-}
-
-smb_ucs2_t *all_string_sub_wa(smb_ucs2_t *s, const char *pattern,
- const char *insert)
-{
- wpstring p, i;
-
- if (!insert || !pattern || !s)
- return NULL;
- push_ucs2(NULL, p, pattern, sizeof(wpstring) - 1, STR_TERMINATE);
- push_ucs2(NULL, i, insert, sizeof(wpstring) - 1, STR_TERMINATE);
- return all_string_sub_w(s, p, i);
-}
-
-/**
Splits out the front and back at a separator.
**/
@@ -1158,26 +1088,10 @@ char *binary_string(char *buf, int len)
return ret;
}
-/**
- Just a typesafety wrapper for snprintf into a fstring.
-**/
-
- int fstr_sprintf(fstring s, const char *fmt, ...)
-{
- va_list ap;
- int ret;
-
- va_start(ap, fmt);
- ret = vsnprintf(s, FSTRING_LEN, fmt, ap);
- va_end(ap);
- return ret;
-}
-
#ifndef HAVE_STRNDUP
/**
Some platforms don't have strndup.
**/
-
char *strndup(const char *s, size_t n)
{
char *ret;
@@ -1197,7 +1111,6 @@ char *binary_string(char *buf, int len)
/**
Some platforms don't have strnlen
**/
-
size_t strnlen(const char *s, size_t n)
{
int i;