summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-07-01 12:49:06 +0200
committerStefan Metzmacher <metze@samba.org>2009-07-01 12:53:40 +0200
commitc229239ea4799bb18973d4bdcb4cb499043d6f15 (patch)
tree654b1729f4a56149946d7138fa56bc06044087fe
parentdd118bf219de03d63412ec32f78f36105a866375 (diff)
downloadsamba-c229239ea4799bb18973d4bdcb4cb499043d6f15.tar.gz
samba-c229239ea4799bb18973d4bdcb4cb499043d6f15.tar.bz2
samba-c229239ea4799bb18973d4bdcb4cb499043d6f15.zip
s3:smbd: remove unused variables passed to parent_dirname()
metze
-rw-r--r--source3/smbd/open.c3
-rw-r--r--source3/smbd/reply.c5
2 files changed, 3 insertions, 5 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index a8dcef1570..21e5804123 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2344,7 +2344,6 @@ static NTSTATUS mkdir_internal(connection_struct *conn,
{
mode_t mode;
char *parent_dir;
- const char *dirname;
NTSTATUS status;
bool posix_open = false;
@@ -2359,7 +2358,7 @@ static NTSTATUS mkdir_internal(connection_struct *conn,
return status;
}
- if (!parent_dirname(talloc_tos(), name, &parent_dir, &dirname)) {
+ if (!parent_dirname(talloc_tos(), name, &parent_dir, NULL)) {
return NT_STATUS_NO_MEMORY;
}
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 8cc865edeb..eb3bfe565a 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -5697,14 +5697,13 @@ static void notify_rename(connection_struct *conn, bool is_dir,
const char *oldpath, const char *newpath)
{
char *olddir, *newdir;
- const char *oldname, *newname;
uint32 mask;
mask = is_dir ? FILE_NOTIFY_CHANGE_DIR_NAME
: FILE_NOTIFY_CHANGE_FILE_NAME;
- if (!parent_dirname(talloc_tos(), oldpath, &olddir, &oldname)
- || !parent_dirname(talloc_tos(), newpath, &newdir, &newname)) {
+ if (!parent_dirname(talloc_tos(), oldpath, &olddir, NULL)
+ || !parent_dirname(talloc_tos(), newpath, &newdir, NULL)) {
TALLOC_FREE(olddir);
return;
}