summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@sernet.de>2007-11-01 17:42:35 +0100
committerVolker Lendecke <vl@sernet.de>2007-11-05 03:40:31 +0100
commit2d73e86ccef0ba66309ce764ebe9df0deb076bb8 (patch)
tree2a0709498632ea25fa968764db24bab8d290bffc /source3
parent082da3d287558dcebcb1e3468ad05eeb7c75ef8c (diff)
downloadsamba-2d73e86ccef0ba66309ce764ebe9df0deb076bb8.tar.gz
samba-2d73e86ccef0ba66309ce764ebe9df0deb076bb8.tar.bz2
samba-2d73e86ccef0ba66309ce764ebe9df0deb076bb8.zip
Remove unnecessary code
SAFE_FREE checks for NULL anyway, and SMB_STRDUP panics on failure (This used to be commit 4cdebda39b9b1790fc5c7df3dc81bfb46b047ad7)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/util_str.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 1f3aab3bce..6458ae3e05 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -411,13 +411,8 @@ char *strupper_static(const char *s)
{
static char *str = NULL;
- if (str) {
- SAFE_FREE(str);
- }
+ SAFE_FREE(str);
str = SMB_STRDUP(s);
- if (!str) {
- return CONST_DISCARD(char *,s);
- }
strupper_m(str);
return str;
}