sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

lib: Use talloc_asprintf_addbuf() in print_socket_options()

Browse Source 
With the proper NULL checks we don't need the stackframe,
use a passed in context instead.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2022-11-28 11:01:16 +01:00 committed by Jeremy Allison
parent bcdbe6ef6b
commit fe8895c83c
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/util/util_net.c
View File

@ -977,9 +977,8 @@ static const smb_socket_option socket_options[] = {
Print socket options.
****************************************************************************/
static void print_socket_options(int s)
static void print_socket_options(TALLOC_CTX *ctx, int s)
{
TALLOC_CTX *frame = NULL;
const smb_socket_option *p = &socket_options[0];
char *str = NULL;
@ -987,9 +986,7 @@ static void print_socket_options(int s)
return;
}
frame = talloc_stackframe();
str = talloc_strdup(frame, "");
str = talloc_strdup(ctx, "");
if (str == NULL) {
DBG_WARNING("talloc failed\n");
goto done;
@ -1006,21 +1003,17 @@ static void print_socket_options(int s)
continue;
}
str = talloc_asprintf_append_buffer(
str,
talloc_asprintf_addbuf(
&str,
"%s%s=%d",
str[0] != '\0' ? ", " : "",
p->name,
val);
if (str == NULL) {
DBG_WARNING("talloc_asprintf_append_buffer failed\n");
goto done;
}
}
DEBUG(5, ("socket options: %s\n", str));
done:
TALLOC_FREE(frame);
TALLOC_FREE(str);
}
/****************************************************************************
@ -1084,8 +1077,8 @@ void set_socket_options(int fd, const char *options)
}
}
print_socket_options(ctx, fd);
TALLOC_FREE(ctx);
print_socket_options(fd);
}
/*