sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

lib/util: Drop unnecessary use of talloc_tos()

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
This commit is contained in:
Volker Lendecke 2014-09-19 16:58:52 +02:00 committed by Martin Schwenke
parent 6d450b3b48
commit 0f9669eb9f
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/util/util.c
View File

@ -61,7 +61,8 @@ _PUBLIC_ const char *tmpdir(void)
**/
int create_unlink_tmp(const char *dir)
{
char *fname;
size_t len = strlen(dir);
char fname[len+25];
int fd;
mode_t mask;
@ -69,8 +70,8 @@ int create_unlink_tmp(const char *dir)
dir = tmpdir();
}
fname = talloc_asprintf(talloc_tos(), "%s/listenerlock_XXXXXX", dir);
if (fname == NULL) {
len = snprintf(fname, sizeof(fname), "%s/listenerlock_XXXXXX", dir);
if (len >= sizeof(fname)) {
errno = ENOMEM;
return -1;
}
@ -78,17 +79,14 @@ int create_unlink_tmp(const char *dir)
fd = mkstemp(fname);
umask(mask);
if (fd == -1) {
TALLOC_FREE(fname);
return -1;
}
if (unlink(fname) == -1) {
int sys_errno = errno;
close(fd);
TALLOC_FREE(fname);
errno = sys_errno;
return -1;
}
TALLOC_FREE(fname);
return fd;
}